bump version

2004-05-19 JP Rosevear <jpr@novell.com> * configure.in: bump version svn path=/trunk/; revision=25982
author: JP Rosevear <jpr@novell.com> 2004-05-20 02:35:59 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2004-05-20 02:35:59 +0800
commit: c7dbb95e79df331a75d7ba49cedc1b8e816422cf (patch)
tree: f8c9851496db10145da1c5bd7e482dc3fd9e1c1d /po/en_CA.po
parent: a9b7ecefe5f6cce56289744e0b68679835634c02 (diff)
download: gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.gz
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.bz2
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.lz
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.xz
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.zst
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.zip
1 files changed, 3677 insertions, 2846 deletions
diff --git a/po/en_CA.po b/po/en_CA.po
index 42aa39bc92..a1169ef37d 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-01 01:25-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-01 01:25-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Report-Msgid-Bugs-To: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
@@ -22,6 +22,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution addressbook"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contact's header: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "current addressbook folder "
@@ -42,14 +50,6 @@ msgstr " cards"
 msgid " card"
 msgstr " card"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contact's header: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
@@ -64,64 +64,20 @@ msgstr "Could not load addressbook"
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certificates"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Addressbook"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Addressbook folder viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Manager your S/Mime certificates here"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEnter password for %s (user %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -159,62 +115,62 @@ msgstr "_Contacts Group"
 msgid "Create a new contacts group"
 msgstr "Create a new contacts group"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
 msgstr "Failed to connect to LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Failed to authenticate with LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Could not perform query on Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "The server responded with no supported search bases"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "This server does not support LDAPv3 schema information"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Error retrieving schema information"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Server did not respond with valid schema information"
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migrating..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personal"
@@ -274,20 +230,42 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Address Book"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/addressbook-view.c:762
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Delete"
+
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Properties..."
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contacts"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -309,6 +287,60 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialog"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autocompletion"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificates"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Addressbook"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Manager your S/Mime certificates here"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr "  S_how Supported Bases "
@@ -330,6 +362,7 @@ msgstr "  S_how Supported Bases "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -394,7 +427,7 @@ msgstr "Add Contacts Group"
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Always"
@@ -409,100 +442,90 @@ msgid "Basic"
 msgstr "Basic"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olour:"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Connecting"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr "Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Email address"
 msgstr "Email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution will use this DN to authenticate you with the server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution will use this email address to authenticate you with the server"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Never"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "One"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr "Only locations within starting point"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "S_earch scope: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr "Search base only"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Search scope:"
 msgstr "Search scope:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Searching"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -512,7 +535,7 @@ msgstr ""
 "server if\n"
 "your LDAP server supports SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -530,7 +553,7 @@ msgstr ""
 "is already\n"
 "secure."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -544,19 +567,19 @@ msgstr ""
 "to security\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr "Starting point and locations within it"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -568,7 +591,7 @@ msgstr ""
 "begin. If you leave this blank, the search will begin at the root of the "
 "directory tree."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -584,7 +607,7 @@ msgstr ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -592,7 +615,7 @@ msgstr ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -602,7 +625,7 @@ msgstr ""
 "be \n"
 "too large will slow down your address book."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -612,7 +635,7 @@ msgstr ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -622,7 +645,7 @@ msgstr ""
 "list.\n"
 "It is for display purposes only. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -634,122 +657,129 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "This option controls how long a search will be run."
 msgstr "This option controls how long a search will be run."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
 msgstr "Timeout:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "U_se SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr "_Add Contacts Group"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "_Display name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid "_Email address:"
 msgstr "_Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Log in method:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Port number:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Server name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:182
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Addressbook name selection interface"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remove All"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Select Contacts from Address Book"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Remove"
 
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Name"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Remove All"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "View Contact List"
@@ -772,22 +802,15 @@ msgstr "Add to Contacts"
 msgid "Unnamed Contact"
 msgstr "Unnamed Contact"
 
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Name"
-
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 #: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Select Contacts from Address Book"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Addressbook name selection interface"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -846,125 +869,127 @@ msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "Address 2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "Address:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "Anniversary:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "Assistant:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "Birthday:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "City:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "Company:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Contact"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "Country:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "Department:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "Free/Busy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Full _Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Home"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "Home page"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Job title:"
 msgstr "Job title:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Location:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "Notes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Other"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_PO Box:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Personal information"
@@ -987,9 +1012,9 @@ msgstr "Webcam:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Work"
@@ -1018,23 +1043,39 @@ msgstr "item7"
 msgid "item8"
 msgstr "item8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Editable"
 
@@ -2006,91 +2047,108 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Location"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Username"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Please select among the following options"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Could not find widget for a field: `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "Location"
+msgstr "Location"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Username"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
@@ -2108,22 +2166,6 @@ msgstr "_Full Name:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete this contact?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Address _2:"
@@ -2269,8 +2311,8 @@ msgstr "contact-list-editor"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Book"
 
@@ -2331,6 +2373,428 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(map)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "map"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "List Members"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organization"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Position"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "work"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "personal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Note"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Job Title"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Home page"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Success"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr "Backend busy"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Address Book does not exist"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+msgid "No Self Contact defined"
+msgstr "No Self Contact defined"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Contact not found"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protocol not supported"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr "Could not cancel"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr "TLS not Available"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "No such source"
+msgstr "No such source"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Other error"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
+msgstr ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Unable to open addressbook"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "The backend for this addressbook was unable to parse this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "The backend for this addressbook refused to perform this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+msgid "This query did not complete successfully."
+msgstr "This query did not complete successfully."
+
+#: addressbook/gui/widgets/eab-gui-util.c:206
+msgid "Do you want to save changes?"
+msgstr "Do you want to save changes?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "_Discard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Error adding contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Error removing contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Error saving %s: %s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:437
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Select target addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Multiple VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:199
+msgid "(none)"
+msgstr "(none)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primary Email"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Select an Action"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Create a new contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Add address to existing contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Querying Address Book..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Edit Contact Info"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Merge E-Mail Address"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "and one other contact."
+msgstr[1] "and one other contact."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Show Full VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Show Compact VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Save in addressbook"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "No contacts"
@@ -2345,8 +2809,8 @@ msgstr[1] "%d contacts"
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Query"
 
@@ -2400,9 +2864,10 @@ msgstr "Address Book"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Save as VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2467,7 +2932,7 @@ msgid "Cut"
 msgstr "Cut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2478,18 +2943,8 @@ msgstr "Copy"
 msgid "Paste"
 msgstr "Paste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Delete"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Current View"
 
@@ -2505,7 +2960,7 @@ msgstr ""
 "has crashed. You will have to restart Evolution in order to use it again"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Any Category"
@@ -2546,21 +3001,6 @@ msgstr "Categories"
 msgid "Company Phone"
 msgstr "Company Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Family Name"
@@ -2597,29 +3037,14 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Note"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Office"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organization"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Other Fax"
@@ -2671,21 +3096,29 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Web Site"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Width"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Height"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Has Focus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Selected"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Field"
@@ -2702,10 +3135,6 @@ msgstr "Text Model"
 msgid "Max field name length"
 msgstr "Max field name length"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Column Width"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2734,402 +3163,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Selected"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(map)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "map"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "List Members"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Position"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "work"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "personal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Job Title"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Home page"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr "Backend busy"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Address Book does not exist"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-msgid "No Self Contact defined"
-msgstr "No Self Contact defined"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Contact ID already exists"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr "Could not cancel"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Authentication Failed"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS not Available"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Other error"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-msgstr ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Unable to open addressbook"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "The backend for this addressbook was unable to parse this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "The backend for this addressbook refused to perform this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Do you want to save changes?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Discard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Error saving %s: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Select target addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Multiple VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(none)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primary Email"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Select an Action"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Create a new contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Add address to existing contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Edit Contact Info"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Merge E-Mail Address"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "and one other contact."
-msgstr[1] "and one other contact."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Show Full VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Show Compact VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Save in addressbook"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Column Width"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3139,17 +3175,17 @@ msgstr "Card View"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow Test"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "This should test the reflow canvas item"
 
@@ -3173,11 +3209,6 @@ msgstr "Evolution VCard importer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Print envelope"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Print contacts"
@@ -3187,6 +3218,11 @@ msgstr "Print contacts"
 msgid "Print contact"
 msgstr "Print contact"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Print envelope"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3371,16 +3407,6 @@ msgstr "Contact Print Test"
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Can not load URI"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
@@ -3437,6 +3463,16 @@ msgstr "In normal mode, there should not need size option."
 msgid "Impossible internal error."
 msgstr "Impossible internal error."
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+msgid "Can not open file"
+msgstr "Can not open file"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "Can not load URI"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error loading default addressbook."
@@ -3453,7 +3489,8 @@ msgstr "No filename provided."
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Enter password"
 
@@ -3485,63 +3522,6 @@ msgstr "Default Priority:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:954
-msgid "Calendars"
-msgstr "Calendars"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Calendar viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Tasks viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:991 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:591 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tasks"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Starting:"
@@ -3571,24 +3551,24 @@ msgstr "_Edit appointment"
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Open"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Dismiss All"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3601,12 +3581,12 @@ msgstr ""
 "Starting at %s\n"
 "Ending at %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3618,7 +3598,7 @@ msgstr ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3635,19 +3615,19 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialize Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialize gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Could not create the alarm notify service factory"
 
@@ -3756,56 +3736,42 @@ msgid "Weekday the week starts on"
 msgstr "Weekday the week starts on"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Whether to ask for confirmation on appointment deletion"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Whether to ask for confirmation when folder is expunged"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Whether to hide completed tasks"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Whether to set a default reminder for events"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Whether to show times in 24h format instead of using am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Description contains"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Location contains"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Unmatched"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1706
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3815,72 +3781,73 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: calendar/gui/calendar-commands.c:362
+#: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
 #: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
 msgid "days"
 msgstr "days"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d %B %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:464
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Properties..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Loading calendar..."
 
-#: calendar/gui/calendar-component.c:800
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Unable to open the calendar '%s' for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:812
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:846
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3888,51 +3855,56 @@ msgstr ""
 "Events cannot be created in a read-only calendar. Please select a read-write "
 "calendar."
 
-#: calendar/gui/calendar-component.c:1110
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1118
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1126
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1127
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:1128
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:1134
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1135
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "C_alendar"
 
-#: calendar/gui/calendar-component.c:1136
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
@@ -3962,15 +3934,35 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Description contains"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Location contains"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Unmatched"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Method not supported when opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
@@ -3979,19 +3971,6 @@ msgstr "Permission denied to open the calendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Could not open the folder in '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "The URI that the calendar will display"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "The type of view to show"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Audio Alarm Options"
@@ -4057,7 +4036,7 @@ msgstr "extra times every"
 msgid "hours"
 msgstr "hours"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -4076,14 +4055,14 @@ msgstr "Basics"
 msgid "Date/Time:"
 msgstr "Date/Time:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Display a message"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Play a sound"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Reminders"
 msgstr "Reminders"
@@ -4098,6 +4077,7 @@ msgstr "Send an email"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:187
 #: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
@@ -4136,10 +4116,98 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of appointment"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr "You must specify a location to get the calendar from."
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "The source location '%s' is not well-formed."
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "The source location '%s' is not a webcal source."
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Source with name '%s' already exists in the selected group"
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Add Tasks Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+msgid "Calendar Properties"
+msgstr "Calendar Properties"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+msgid "Remote"
+msgstr "Remote"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "Task List Properties"
+msgstr "Task List Properties"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Add Calendar"
+msgstr "_Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_Add Group"
+msgstr "_Add Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr "_Refresh Interval:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
+msgstr "_Refresh:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr "_Source URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "weeks"
+
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4153,19 +4221,19 @@ msgstr "Don't Remove"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Disable"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Enable"
 
@@ -4402,86 +4470,6 @@ msgstr "_Wed"
 msgid "before every appointment"
 msgstr "before every appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "You must specify a location to get the calendar from."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "The source location '%s' is not well-formed."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "The source location '%s' is not a webcal source."
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Source with name '%s' already exists in the selected group"
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Add Tasks Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remote"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Task List Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr "_Add Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Refresh Interval:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr "_Refresh:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Source URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr "_Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "weeks"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4562,31 +4550,6 @@ msgstr "%s  You have made changes. Forget those changes and update the editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " to "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Due "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
-
 #: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Could not update object"
@@ -4620,8 +4583,8 @@ msgid "No summary"
 msgstr "No summary"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1037
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -4635,6 +4598,31 @@ msgstr "Changes made to this item may be discarded if an update arrives"
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " to "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Due "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Due "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Could not open source"
@@ -4755,27 +4743,27 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appointment"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Reminder"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:229
+#: calendar/gui/dialogs/event-editor.c:298
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Meeting"
 
@@ -4871,17 +4859,12 @@ msgid "_Start time:"
 msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
+#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4907,8 +4890,8 @@ msgstr "_Delegate To..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:795
+#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5180,24 +5163,20 @@ msgstr "_Discard Changes"
 msgid "Save Event"
 msgstr "Save Event"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Select source"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Select destination %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "calendar"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Destination folder:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "task list"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#, fuzzy
+msgid "Task List"
+msgstr "New Task List"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5225,38 +5204,44 @@ msgid "% _Complete"
 msgstr "% _Complete"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Completed"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "In Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:875 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -5304,8 +5289,9 @@ msgstr "Unable to open tasks in '%s'."
 msgid "Con_fidential"
 msgstr "Con_fidential"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Description:"
@@ -5449,101 +5435,56 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:321
-#: calendar/gui/e-cal-model.c:328 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Public"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:330
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Private"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Confidential"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Click to open %s"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "End Date"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Untitled"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
 msgstr "Start Date"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Summary"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Free"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Busy"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Due date:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Yes"
+#: calendar/gui/e-cal-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Priority:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Web Page:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Unknown"
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+msgid "Public"
+msgstr "Public"
 
-#: calendar/gui/e-cal-model.c:877
-msgid "Recurring"
-msgstr "Recurring"
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330
+msgid "Private"
+msgstr "Private"
 
-#: calendar/gui/e-cal-model.c:879
-msgid "Assigned"
-msgstr "Assigned"
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332
+msgid "Confidential"
+msgstr "Confidential"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5589,6 +5530,15 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Free"
+
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Busy"
+
 #: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
@@ -5598,8 +5548,8 @@ msgid "Updating objects"
 msgstr "Updating objects"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
@@ -5608,41 +5558,42 @@ msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Print..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2602 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
+#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copy"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Paste"
 
@@ -5697,89 +5648,160 @@ msgstr "Priority"
 msgid "Start date"
 msgstr "Start date"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
+msgid "Summary"
+msgstr "Summary"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "New Task"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Go to _Today"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Go to Date..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Settings..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "End Date"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "Start Date"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
+#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Unknown"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recurring"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Assigned"
+
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Yes"
+
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5796,43 +5818,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %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-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5928,6 +5943,7 @@ msgstr "iCalendar Error"
 msgid "An unknown person"
 msgstr "An unknown person"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:910
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -5940,10 +5956,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>None</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5973,7 +5985,7 @@ msgstr "Update"
 #: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
 #: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
 #: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6186,59 +6198,55 @@ msgstr "The attachment does not contain a valid calendar message"
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Calendar file could not be updated!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "There was an error on the CORBA system\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "You don't have the right permissions to update the calendar\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -6355,36 +6363,6 @@ msgstr "Delegated"
 msgid "In Process"
 msgstr "In Process"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
@@ -6445,7 +6423,34 @@ msgstr "Meeting _start time:"
 msgid "Meeting _end time:"
 msgstr "Meeting _end time:"
 
-#: calendar/gui/e-tasks.c:615 calendar/gui/gnome-cal.c:2021
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2093
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Enter the password for `%s'"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6454,19 +6459,19 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:643 calendar/gui/gnome-cal.c:2060
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr "The task backend for '%s' has crashed."
 
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:717
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:740
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6475,46 +6480,105 @@ msgstr ""
 "Error opening %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:761
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:865
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:915
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/gnome-cal.c:1879
+#: calendar/gui/e-tasks.c:960
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tasks"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1898
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1921
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:2051
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "The calendar backend for '%s' has crashed."
 
-#: calendar/gui/gnome-cal.c:2895
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Purging"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6658,6 +6722,23 @@ msgstr "Birthdays & Anniversaries"
 msgid "On The Web"
 msgstr "On The Web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Unable to open the calendar '%s'."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Unable to open tasks in '%s'."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1st"
@@ -6877,7 +6958,7 @@ msgid "Contacts: "
 msgstr "Contacts: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Print Preview"
 
@@ -6889,25 +6970,44 @@ msgstr "Print Item"
 msgid "Print Setup"
 msgstr "Print Setup"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Task List '%s' will be removed. Are you sure you want to continue?"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "New Task List"
 
-#: calendar/gui/tasks-component.c:469
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d selected"
+msgstr[1] ", %d selected"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Loading tasks"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Unable to open the task list '%s' for creating events and meetings"
 
-#: calendar/gui/tasks-component.c:481
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:519
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6915,40 +7015,31 @@ msgstr ""
 "Events cannot be created in a read-only calendar. Please select a read-write "
 "calendar."
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:733
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:734
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:740
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:741
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:742
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "The URI of the tasks folder to display"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Could not load the tasks in `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6960,11 +7051,11 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Do not ask me again."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
@@ -8612,7 +8703,7 @@ msgstr "Copy folder content locally for offline operation"
 msgid "Downloading new messages for offline mode"
 msgstr "Downloading new messages for offline mode"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparing folder '%s' for offline"
@@ -8705,33 +8796,6 @@ msgstr "Invalid arguments to (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Cannot parse search expression: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Error executing search expression: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) requires a single bool result"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Performing query on unknown header: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8763,7 +8827,52 @@ msgstr "Learning junk and/or non junk message(s)"
 msgid "Filtering new message(s)"
 msgstr "Filtering new message(s)"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Cannot parse search expression: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Error executing search expression: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+#: camel/camel-folder-search.c:785
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Performing query on unknown header: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8774,15 +8883,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8791,27 +8900,27 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8822,81 +8931,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
+#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
+#: camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Cannot build locking helper pipe: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Cannot fork locking helper: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Could not lock '%s': protocol error with lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Could not lock '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8917,6 +9006,26 @@ msgstr "Failed to get lock using fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Failed to get lock using flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Cannot build locking helper pipe: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Cannot fork locking helper: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Could not lock '%s': protocol error with lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Could not lock '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9170,7 +9279,7 @@ msgstr "The referenced credentials have expired."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9367,7 +9476,8 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
+#, fuzzy
+msgid "Cannot add encryption certificate"
 msgstr "Cannot add add encryption certificate"
 
 #: camel/camel-smime-context.c:360
@@ -9382,7 +9492,7 @@ msgstr "Cannot create encoder context"
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
@@ -9442,91 +9552,93 @@ msgstr "Cannot calculate digests"
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Certficate only message, cannot verify certificates"
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Certificate only message, certificates imported and verified"
 msgstr "Certficate only message, certificates imported and verified"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Can't find signature digests"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Decoder failed"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Can't find certificate for `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Can't find common bulk encryption algorithm"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Can't allocate slot for encryption bulk key"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Cannot create CMS Message"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Can't create CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Can't attach CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Can't attach CMS data object"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Can't create CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Can't add CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Can't create encoder context"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Decoder failed, error %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "import keys: unimplemented"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "export keys: unimplemented"
 
@@ -9543,16 +9655,26 @@ msgstr "Cannot create folder `%s': folder exists"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Cannot create folder `%s': folder exists"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Cannot rename folder: %s: Invalid operation"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
@@ -9673,7 +9795,7 @@ msgstr "Key usage does not support certificate signing"
 msgid "Error in application verification"
 msgstr "Error in application verification"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9686,11 +9808,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Signature:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "BAD"
 
@@ -9714,7 +9836,7 @@ msgstr ""
 "Do you wish to accept anyway?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9729,7 +9851,7 @@ msgstr ""
 "\n"
 "Do you wish to accept?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9738,7 +9860,7 @@ msgstr ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9747,7 +9869,7 @@ msgstr ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9756,7 +9878,7 @@ msgstr ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9770,17 +9892,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Could not parse URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error storing `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No such message %s in %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
@@ -9789,11 +9911,6 @@ msgstr "Cannot copy or move messages into a Virtual Folder"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Cannot rename folder: %s: Invalid operation"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9808,10 +9925,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Cannot copy messages to the Junk folder"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Check for new messages in all folders"
@@ -9842,6 +9961,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
@@ -9861,26 +9981,322 @@ msgstr ""
 msgid "Checklist"
 msgstr "Checklist"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Unexpected response from IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Server unexpectedly disconnected: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Cannot append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Cannot append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Folders"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Show only subscribed folders"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Override server-supplied folder namespace"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Namespace"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For reading and storing mail on IMAP servers."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"This option will connect to the IMAP server using a plaintext password."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP service for %s on %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Could not connect to %s (port %d): %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL unavailable"
+
+#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Connection cancelled"
+
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Failed to connect to IMAP server %s in secure mode: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Failed to connect to IMAP server %s in secure mode: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPlease enter the SMTP password for %s on host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Cannot rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete folder: %s: No such folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Command:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Cannot rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Unexpected response from IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Server unexpectedly disconnected: %s"
+
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "Unknown error"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9925,21 +10341,21 @@ msgstr "Could not create directory %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder was destroyed and recreated on server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9955,25 +10371,25 @@ msgstr ""
 "Cannot get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "No such message"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
@@ -10011,23 +10427,6 @@ msgstr "Use custom command to connect to server"
 msgid "Command:"
 msgstr "Command:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Folders"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Show only subscribed folders"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Override server-supplied folder namespace"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namespace"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Apply filters to new messages in INBOX on this server"
@@ -10048,85 +10447,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Could not connect to %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL unavailable"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Connection cancelled"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10137,26 +10494,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10164,7 +10513,7 @@ msgstr "The parent folder is not allowed to contain subfolders"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
@@ -10271,58 +10620,58 @@ msgstr ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
 #: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Store root %s is not an absolute path"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Store root %s is not a regular directory"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Cannot get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Local stores do not have an inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Local mail file %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Could not rename folder %s to %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not rename '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:423
 #: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Could not delete folder summary file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-local-store.c:433
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Could not delete folder index file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10388,7 +10737,7 @@ msgstr "Could not delete folder `%s': %s"
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10719,7 +11068,7 @@ msgid "Server rejected username/password"
 msgstr "Server rejected username/password"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: camel/providers/nntp/camel-nntp-folder.c:263
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -10728,8 +11077,8 @@ msgid "User cancelled"
 msgstr "User cancelled"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10738,46 +11087,46 @@ msgstr "User cancelled"
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: camel/providers/nntp/camel-nntp-folder.c:188
+#: camel/providers/nntp/camel-nntp-folder.c:228
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Internal error: uid in invalid format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Could not get article %s from NNTP server"
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "Posting not allowed by news server"
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: camel/providers/nntp/camel-nntp-folder.c:373
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr "Failed to send newsgroups header: %s: message not posted"
 
-#: camel/providers/nntp/camel-nntp-folder.c:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: camel/providers/nntp/camel-nntp-folder.c:413
+#: camel/providers/nntp/camel-nntp-folder.c:426
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
 msgstr "Error posting to newsgroup: %s: message not posted"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:438
 msgid "Error reading response to posted message: message not posted"
 msgstr "Error reading response to posted message: message not posted"
 
-#: camel/providers/nntp/camel-nntp-folder.c:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr "Error posting message: %s: message not posted"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "You cannot post NNTP messages while working offline!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "You cannot copy messages from a NNTP folder!"
 
@@ -10953,8 +11302,8 @@ msgstr "No message with uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
@@ -11398,7 +11747,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "attachment"
 
@@ -11442,6 +11791,102 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Cannot sign outgoing message: No signing certificate set for from account"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Cannot encrypt outgoing message: No encryption certificate set for from "
+"account"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Open file"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signature:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> File Attached"
+msgstr[1] "<b>%d</b> Files Attached"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Hide _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Show _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Compose a message"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+
+#: composer/e-msg-composer.c:3175
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Posting destination"
@@ -11522,109 +11967,79 @@ msgstr "Click here to select folders to post to"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-
-#: composer/e-msg-composer.c:1273
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Open file"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "You cannot attach the file `${0}' to this message."
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autogenerated"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
+msgstr "${1}"
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Signature:"
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgstr "The file `${0}' is not a regular file and cannot be sent in a message."
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr "Directories can not be attached to Messages."
 
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Show _Attachment Bar (drop attachments here)"
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
+msgstr "Unfinished messages found"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
+msgstr "Do you want to recover unfinished messages?"
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 
-#: composer/e-msg-composer.c:3165
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
+msgstr "Don't Recover"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#: composer/mail-composer-errors.xml.h:18
+msgid "Recover"
+msgstr "Recover"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Could not save to autosave file \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Error saving to autosave because \"{1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Warning: Modified Message"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -11632,15 +12047,8 @@ msgstr ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr "Because \"${0}\", you may need to select different mail options."
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr "Because \"${1}\"."
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11650,79 +12058,41 @@ msgstr ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 
-#: composer/mail-composer-errors.xml.in.h:7
-msgid "Could not create message."
-msgstr "Could not create message."
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr "Could not read signature file \"{0}\"."
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Could not save to autosave file \"{0}\"."
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr "Directories can not be attached to Messages."
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr "Do you want to recover unfinished messages?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr "Don't Recover"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Error saving to autosave because \"{1}\"."
-
-#: composer/mail-composer-errors.xml.in.h:15
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-
-#: composer/mail-composer-errors.xml.in.h:16
-msgid "Recover"
-msgstr "Recover"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 msgid "Save Message"
 msgstr "Save Message"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr "The file `${0}' is not a regular file and cannot be sent in a message."
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
+msgstr "Could not create message."
 
-#: composer/mail-composer-errors.xml.in.h:19
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr "Because \"${0}\", you may need to select different mail options."
 
-#: composer/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
-msgstr "Unfinished messages found"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr "Could not read signature file \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr "Because \"${1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr "All accounts have been removed."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 msgid "You need to configure an account before you can compose mail."
 msgstr "You need to configure an account before you can compose mail."
 
@@ -11854,7 +12224,8 @@ msgstr ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 
-#: e-util/e-dialog-utils.c:251
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
@@ -11876,16 +12247,12 @@ msgstr "Sync Categories:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -11937,31 +12304,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12042,71 +12401,88 @@ msgstr "Select a time to compare against"
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr "Bad regular expression \"{0}\"."
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "Could not compile regular expression \"{1}\"."
-
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "File \"{0}\" does not exist or is not a regular file."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Missing date."
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "You must choose a date."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "You must specify a file name."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "File \"{0}\" does not exist or is not a regular file."
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "Missing name."
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
+msgstr "Bad regular expression \"{0}\"."
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "Could not compile regular expression \"{1}\"."
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "Missing name."
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "You must name this filter."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr "You must name this vFolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr "Name \"{0}\" already used."
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "Please choose another name."
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "No sources selected."
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
+#, fuzzy
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
 msgstr ""
 "You must specify at least one folder as a source. You may select folders "
 "individually, or select all local and/or remote folders."
@@ -12120,64 +12496,11 @@ msgstr "Choose a file"
 msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Important"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "To Do"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Later"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Rule name:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Untitled"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>If</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Execute actions"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "if all criteria are met"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "if any criteria are met"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "incoming"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "outgoing"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12266,6 +12589,75 @@ msgstr "with all local folders"
 msgid "years"
 msgstr "years"
 
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
+#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Important"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "To Do"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Later"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Rule name:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>If</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "if all criteria are met"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "if any criteria are met"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Execute actions"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegated"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Recipients"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Replies to %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Include:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "incoming"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "outgoing"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12395,7 +12787,7 @@ msgstr "is not Flagged"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12432,7 +12824,7 @@ msgstr "Pipe to Program"
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Read"
 
@@ -12501,9 +12893,9 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subject"
@@ -12564,102 +12956,60 @@ msgstr "Subject does not contain"
 msgid "Virtual _Folders"
 msgstr "Virtual _Folders"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "A_dd"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder source"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure mail preferences, including security and message display, here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution Mail folder viewer"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Default]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Account name"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
+
+#: mail/em-composer-utils.c:1499
+msgid "an unknown sender"
+msgstr "an unknown sender"
+
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-composer-utils.c:1509
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
 
@@ -12693,264 +13043,437 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2334
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Create folder"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Loading..."
-
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:936
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:943
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:945
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:961
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:2108 mail/em-folder-tree.c:2121
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Copy to Folder"
+
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "_Move to Folder"
+
+#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Move"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancel Task"
+
+#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2148
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copy"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2334 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2597 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2598
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2603
-msgid "_Move"
-msgstr "_Move"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2607
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2613 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Inbox"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+msgid "Loading..."
+msgstr "Loading..."
+
+#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
+msgid "Mail"
+msgstr "Mail"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder on Thread"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filter on Thread"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: mail/em-folder-view.c:2214
+#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "From"
+
+#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "To"
+
+#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
+
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Click to open %s"
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Valid signature, cannot verify sender"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Mailer"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%a, %R %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -12958,11 +13481,7 @@ msgstr "Click to open %s"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12970,11 +13489,7 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12982,11 +13497,7 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12994,11 +13505,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13006,11 +13517,7 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13018,11 +13525,7 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -13032,11 +13535,7 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13044,11 +13543,7 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: mail/em-format-html-display.c:658
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13058,178 +13553,60 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Hide"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "From"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "To"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Every time"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Once per day"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Once per week"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Once per month"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13241,25 +13618,53 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Failed to migrate pop3 uid caches: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Cannot create folder `%s': %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Failed to migrate folder expand state: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Could not rename folder %s to %s: %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Unable to save grouplist file for %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Failed to create directory `%s': %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Failed to open store for `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Failed to create directory `%s': %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Unable to create output file: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13270,88 +13675,74 @@ msgstr "Save As..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Se_nd message to..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Don't show this message again."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Forwarded Message --------"
-
-#: mail/em-utils.c:1137
-msgid "an unknown sender"
-msgstr "an unknown sender"
-
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Save Message..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -13479,10 +13870,15 @@ msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "List of accounts"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "List of accounts"
+
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13490,11 +13886,11 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13502,15 +13898,19 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "List of mime types to check for bonobo component viewers"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
@@ -13520,89 +13920,89 @@ msgstr ""
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Message-display style (normal, full headers, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum days between emptying the trash on exit"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the trash on exit, in days."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "New Mail Notify sound file"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "New Mail Notify type"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13610,34 +14010,26 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Recognize links in text and replace them."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Recognize smileys in text and replace them with images."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Run junk test on incoming mail"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
@@ -13826,33 +14218,64 @@ msgstr "port for starting user runned spamd"
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure mail preferences, including security and message display, here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Mail"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13860,15 +14283,15 @@ msgstr "Evolution is importing your old Elm mail"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importing..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
 
@@ -13897,18 +14320,46 @@ msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
@@ -13918,7 +14369,7 @@ msgstr "Scanning %s"
 msgid "Priority Filter \"%s\""
 msgstr "Priority Filter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13944,7 +14395,7 @@ msgstr ""
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13956,7 +14407,7 @@ msgstr ""
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
 
-#: mail/importers/netscape-importer.c:692
+#: mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13970,23 +14421,23 @@ msgstr ""
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution is importing your old Netscape data"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importing Netscape data"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Settings"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Mail Filters"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14019,124 +14470,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Account Editor"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Key Agreement"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "User_name:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Path:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Replies to %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d unread"
 
-#: mail/mail-component.c:531
-#, c-format
-msgid ", %d selected"
-msgstr ", %d selected"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Connecting to server..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identity"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 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 "
@@ -14146,12 +14609,12 @@ msgstr ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Receiving Mail"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14159,15 +14622,15 @@ msgstr ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Please select among the following options"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14175,11 +14638,11 @@ msgstr ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Account Management"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14193,14 +14656,6 @@ msgstr ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Connecting to server..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " Ch_eck for Supported Types "
@@ -14799,11 +15254,64 @@ msgstr "colour"
 msgid "description"
 msgstr "description"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
+msgstr "Invalid authentication"
+
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Are you sure you want to send a message in HTML format?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email: {0} Send anyway?"
+
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+msgid "_Send"
+msgstr "_Send"
+
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Are you sure you want to send a message without a subject?"
+
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -14811,11 +15319,78 @@ msgstr ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of the topic of your letter."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Are you sure you want to send a message with only BCC recipients?"
+
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+#, fuzzy
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+"The contact list you are sending to is configured to hide list recipients. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient."
+
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+"This message cannot be sent because you have not specified any Recipients"
+
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr "Use default drafts folder?"
+
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr "Use _Default"
+
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -14823,7 +15398,17 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "If you continue, you will not be able to recover these messages."
+
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "_Expunge"
+
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14831,373 +15416,367 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: mail/mail-errors.xml.in.h:6
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Are you sure you want to send a message in HTML format?"
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
+msgstr "_Empty Trash"
 
-#: mail/mail-errors.xml.in.h:7
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Are you sure you want to send a message with only BCC recipients?"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: mail/mail-errors.xml.in.h:8
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Are you sure you want to send a message without a subject?"
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
-msgstr "Because \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr "Your message message, with the subject \"{0}\" was not delivered."
 
-#: mail/mail-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+#, fuzzy
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent. The message is stored "
+"in the Outbox folder. Check the message for errors and resend."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
-msgstr "Because \"{2}\"."
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr "Error while {0}."
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "Cannot add vFolder \"{0}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr "{1}."
 
-#: mail/mail-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr "Error while performing operation."
 
-#: mail/mail-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
-msgstr "Cannot create folder \"{0}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr "{0}."
 
-#: mail/mail-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
-msgstr "Cannot create temporary save directory."
+#. mail:session-message-info secondary
+#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+msgid "Enter password."
+msgstr "Enter password."
+
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
+msgstr "Error loading filter definitions."
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Cannot save to directory \"{0}\"."
+
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+msgid "Cannot save to file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Cannot create the save directory, because \"{1}\""
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
+msgstr "Cannot create temporary save directory."
+
+#. mail:no-create-tmp-path secondary
+#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
+
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
+msgstr "File exists but cannot be overwritten."
+
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
+msgstr "File exists but is not a regular file."
+
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:18
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename or move system folder \"{0}\"."
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "Delete \"{0}\"?"
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 
-#: mail/mail-errors.xml.in.h:20
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Cannot rename \"{0}\" to \"{1}\"."
+
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "A folder named \"{1}\" already exists. Please use a different name."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr "Because \"{2}\"."
+
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
-#: mail/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
-msgstr "Cannot open source \"{1}\""
-
-#: mail/mail-errors.xml.in.h:22
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
-#: mail/mail-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Cannot rename or move system folder \"{0}\"."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder \"{0}\"."
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "Cannot open source \"{1}\""
 
-#: mail/mail-errors.xml.in.h:26
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Cannot save to directory \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Cannot set signature script \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
-msgstr "Could not save signature file."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "You have not filled in all of the required information."
 
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
-msgstr "Delete \"{0}\"?"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "You may not create two accounts with the same name."
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 msgid "Delete account?"
 msgstr "Delete account?"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
-msgstr "Discard changes?"
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Are you sure you want to delete this account?"
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
-msgstr "Do you wish to save your changes?"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "If you proceed, the account information will be deleted permanently."
 
-#: mail/mail-errors.xml.in.h:36
+#: mail/mail-errors.xml.h:169
 msgid "Don't delete"
 msgstr "Don't delete"
 
-#: mail/mail-errors.xml.in.h:37
-msgid "Enter password."
-msgstr "Enter password."
-
-#: mail/mail-errors.xml.in.h:38
-msgid "Error loading filter definitions."
-msgstr "Error loading filter definitions."
-
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr "Error while performing operation."
-
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
-msgstr "Error while {0}."
-
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
-msgstr "File exists but cannot be overwritten."
-
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
-msgstr "File exists but is not a regular file."
-
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "If you continue, you will not be able to recover these messages."
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "Could not save signature file."
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "If you proceed, the account information will be deleted permanently."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr "Because \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Cannot set signature script \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
-msgstr "Invalid authentication"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr "The script file must exist and be executable."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr "Mail filters automatically updated."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "Discard changes?"
 
-#: mail/mail-errors.xml.in.h:49
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "Do you wish to save your changes?"
 
-#: mail/mail-errors.xml.in.h:50
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Discard changes"
 
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly. Go to the virtual folder editor "
+"to add it explictly, if required."
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"The contact list you are sending to is configured to hide list recipients. "
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "Cannot add vFolder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr "vFolders automatically updated."
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
 msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
 "been updated."
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr "The script file must exist and be executable."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr "Mail filters automatically updated."
 
-#: mail/mail-errors.xml.in.h:59
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
 msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
-"This folder may have been added implictly. Go to the virtual folder editor "
-"to add it explictly, if required."
+"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
+"have been updated."
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
-"This message cannot be sent because you have not specified any Recipients"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
-msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
-msgstr "Use _Default"
-
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
-msgstr "Use default drafts folder?"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "You have not filled in all of the required information."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "You have unsent messages, do you wish to quit anyway?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "You may not create two accounts with the same name."
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
-
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
-msgstr "Your message message, with the subject \"{0}\" was not delivered."
-
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Discard changes"
-
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
-msgstr "_Empty Trash"
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
-msgstr "_Expunge"
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Overwrite"
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
 msgstr "_Send"
 
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
-msgstr "vFolders automatically updated."
-
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr "{0}"
-
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr "{0}."
-
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr "{1}"
-
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr "{1}."
-
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -15206,20 +15785,20 @@ msgstr "Pinging %s"
 msgid "Working"
 msgstr "Working"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtering Folder"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15228,115 +15807,115 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d message(s)"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messsage(s)"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15345,7 +15924,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15354,11 +15933,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15367,17 +15946,17 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
@@ -15441,24 +16020,24 @@ msgstr "Updating..."
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "User canceled operation."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
@@ -15498,89 +16077,94 @@ msgstr "Forwarded message"
 msgid "Invalid folder: `%s'"
 msgstr "Invalid folder: `%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setting up vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Updating vfolders for uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Updating vfolders for uri: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Unseen"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Seen"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Answered"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Lowest"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Lower"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Higher"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Highest"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3105
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -15612,43 +16196,43 @@ msgstr "Received"
 msgid "Size"
 msgstr "Size"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Call"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Forward"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Review"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
@@ -15692,18 +16276,6 @@ msgstr "_Subscribe"
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
@@ -15766,6 +16338,32 @@ msgstr "mail"
 msgid "Brought to you by"
 msgstr "Brought to you by"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Unknown error"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Generic error"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Untitled)"
@@ -15903,7 +16501,7 @@ msgstr "Unable to execute importer"
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Closing connections..."
 
@@ -15949,82 +16547,62 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution is in the process of going offline."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail to %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "The GNOME Pilot tools do not appear to be installed on this system."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Error executing %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy is not installed."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy could not be run."
 
-#: shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
+#: shell/e-shell-window-commands.c:171
+#, fuzzy
+msgid "About Evolution"
 msgstr "About Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: shell/e-shell-window.c:336
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-
-#: shell/e-shell-window.c:343
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution is in the process of going offline."
-
-#: shell/e-shell-window.c:349
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Generic error"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Checkbox"
@@ -16094,6 +16672,51 @@ msgstr "Active Connections"
 msgid "Click OK to close these connections and go offline"
 msgstr "Click OK to close these connections and go offline"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "C_alendar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contacts: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Mail"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_Tasks"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "File _type:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Sent _Messages Folder:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "_Account name:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Folder Name"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "User_name:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
@@ -16136,6 +16759,18 @@ msgstr ""
 "\n"
 "Click the \"Apply\" button to save your settings. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -16194,13 +16829,14 @@ msgstr "Don't ask me again"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
-#: shell/main.c:230
-#, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
 "but some features are either unfinished or do not work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -16229,56 +16865,48 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Don't tell me again"
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Cannot register the Ximian Evolution shell."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Cannot initialize the Ximian Evolution shell: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcibly shut down all evolution components"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16287,6 +16915,72 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Connecting"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Cannot register the Ximian Evolution shell."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Account Assistant"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -16523,11 +17217,6 @@ msgstr "You have certificates on file that identify these people:"
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16718,6 +17407,11 @@ msgstr "Subject Unique ID"
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
@@ -16826,7 +17520,8 @@ msgid "Select all contacts"
 msgstr "Select all contacts"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Send a mess to the selected contacts."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16857,8 +17552,8 @@ msgstr "View the current contact"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Actions"
@@ -16876,7 +17571,8 @@ msgid "_Preview Pane"
 msgstr "_Preview Pane"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Save as VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17332,6 +18028,16 @@ msgstr "_Invert Selection"
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "_Close"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
@@ -17569,7 +18275,8 @@ msgid "Open the selected message in a new window"
 msgstr "Open the selected message in a new window"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Open the selected message in the composer to re-send it"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17684,58 +18391,46 @@ msgstr "VFolder on _Subject..."
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copy to Folder"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Create Filter From Message"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Message Display"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Move to Folder"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal Display"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Open Message"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Resend..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Tools"
@@ -17744,16 +18439,6 @@ msgstr "_Tools"
 msgid "_Undelete"
 msgstr "_Undelete"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr "_Close"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Attach"
@@ -18142,6 +18827,11 @@ msgstr "_Quick Reference"
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "New _Window"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "By _Company"
@@ -18206,10 +18896,6 @@ msgstr "With _Due Date"
 msgid "With _Status"
 msgstr "With _Status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18365,6 +19051,35 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution Mail"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Meeting Information"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution Test"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Printed Fonts</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expanded"
@@ -18478,6 +19193,31 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Find _Now"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18488,3 +19228,94 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Addressbook folder viewer"
+
+#~ msgid "Address 2:"
+#~ msgstr "Address 2:"
+
+#~ msgid "Blog:"
+#~ msgstr "Blog:"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Calendar viewer"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution Tasks viewer"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Could not initialize gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Could not open the folder in '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "The URI that the calendar will display"
+
+#~ msgid "The type of view to show"
+#~ msgstr "The type of view to show"
+
+#~ msgid "Display a message"
+#~ msgstr "Display a message"
+
+#~ msgid "Select source"
+#~ msgstr "Select source"
+
+#~ msgid "calendar"
+#~ msgstr "calendar"
+
+#~ msgid "task list"
+#~ msgstr "task list"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Calendar file could not be updated!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "The URI of the tasks folder to display"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Could not load the tasks in `%s'"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution Mail folder viewer"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder on Thread"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filter on Thread"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Failed to migrate pop3 uid caches: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Failed to migrate folder expand state: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Failed to open store for `%s': %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI of the mail source that the view will display"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Cannot initialize the Ximian Evolution shell: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Resend..."
author	JP Rosevear <jpr@novell.com>	2004-05-20 02:35:59 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2004-05-20 02:35:59 +0800
commit	c7dbb95e79df331a75d7ba49cedc1b8e816422cf (patch)
tree	f8c9851496db10145da1c5bd7e482dc3fd9e1c1d /po/en_CA.po
parent	a9b7ecefe5f6cce56289744e0b68679835634c02 (diff)
download	gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.gz gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.bz2 gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.lz gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.xz gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.zst gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.zip