Updated British English translation

svn path=/trunk/; revision=25773

2 files changed, 2273 insertions, 2011 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 0b9daaad0e..5e9b02dcc2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-03  Gareth Owen  <gowen72@yahoo.com>
+
+	* en_GB.po: Updated British English translation
+
 2004-05-03  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated.
diff --git a/po/en_GB.po b/po/en_GB.po
index 67f022c281..6066ca35bb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-02 15:56-0400\n"
-"PO-Revision-Date: 2004-05-02 16:05-0400\n"
+"POT-Creation-Date: 2004-05-03 21:27-0400\n"
+"PO-Revision-Date: 2004-05-03 21:32-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,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 "
@@ -41,14 +49,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:"
@@ -63,63 +63,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);
-#: 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"
@@ -199,8 +156,8 @@ msgstr "Migrating `%s':"
 #. create the local source group
 #: 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:243
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -208,7 +165,7 @@ msgstr "On This Computer"
 #: 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:924 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personal"
@@ -268,20 +225,49 @@ 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:687
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Address book '%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:774
+msgid "New Address Book"
+msgstr "New 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:775
+#: 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:776
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Properties..."
+
+#: addressbook/gui/component/addressbook-view.c:1001
+msgid "UID of the contacts source that the view will display"
+msgstr "UID of the contacts source that the view will display"
+
+#: addressbook/gui/component/addressbook-view.c:1006
+msgid "The URI that the address book will display"
+msgstr "The URI that the address book will display"
+
+#. 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:1031
+#: 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/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -303,6 +289,54 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialogue"
 
+#: 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"
+
+#: 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/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: 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/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr "  S_how Supported Bases "
@@ -324,6 +358,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 "*"
@@ -388,7 +423,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"
@@ -403,100 +438,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"
@@ -506,7 +531,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"
@@ -524,7 +549,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"
@@ -538,19 +563,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"
@@ -562,7 +587,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"
@@ -578,7 +603,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"
 "\"."
@@ -586,7 +611,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"
@@ -596,7 +621,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 "
@@ -606,7 +631,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"
@@ -616,7 +641,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"
@@ -628,122 +653,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"
@@ -766,22 +798,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>"
@@ -840,7 +865,7 @@ 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/contact-editor/e-contact-editor.c:180
 #: addressbook/gui/widgets/eab-contact-display.c:302
 #: addressbook/gui/widgets/eab-contact-display.c:321
 msgid "AIM"
@@ -884,7 +909,7 @@ 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/e-contact-editor.c:261
 #: 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
@@ -892,7 +917,7 @@ 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/e-contact-editor.c:1443
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -913,8 +938,8 @@ msgid "Full _Name..."
 msgstr "Full _Name..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Home"
 
@@ -954,8 +979,8 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Other"
 
@@ -981,9 +1006,9 @@ msgstr "Webcam:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
 #: 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:923 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Work"
@@ -1012,6 +1037,22 @@ 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
@@ -1019,16 +1060,16 @@ msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:282
 #: 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"
 
@@ -2000,91 +2041,91 @@ 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:181
 #: 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
 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/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/widgets/eab-contact-display.c:307
 #: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #: addressbook/gui/widgets/eab-contact-display.c:306
 #: addressbook/gui/widgets/eab-contact-display.c:325
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: 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.c:185
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:268
 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:275
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:289
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 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:1665
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#: addressbook/gui/contact-editor/e-contact-editor.c:2512
 #, 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"
@@ -2102,22 +2143,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:"
@@ -2263,8 +2288,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"
 
@@ -2325,417 +2350,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "No contacts"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d contact"
-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
-msgid "Query"
-msgstr "Query"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Error getting book view"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Model"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Error modifying card"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:161
-msgid "Name begins with"
-msgstr "Name begins with"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:162
-msgid "Email begins with"
-msgstr "Email begins with"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
-msgid "Category is"
-msgstr "Category is"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
-msgid "Any field contains"
-msgstr "Any field contains"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Advanced..."
-msgstr "Advanced..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:236
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Type"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:506
-msgid "Address Book"
-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
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Save as VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
-msgid "New Contact..."
-msgstr "New Contact..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-msgid "New Contact List..."
-msgstr "New Contact List..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-msgid "Go to Folder..."
-msgstr "Go to Folder..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
-msgid "Import..."
-msgstr "Import..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Search for Contacts..."
-msgstr "Search for Contacts..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
-msgid "Address Book Sources..."
-msgstr "Address Book Sources..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-msgid "Pilot Settings..."
-msgstr "Pilot Settings..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Forward Contact"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-msgid "Send Message to Contact"
-msgstr "Send Message to Contact"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Print"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-msgid "Print Envelope"
-msgstr "Print Envelope"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
-msgid "Copy to Address Book..."
-msgstr "Copy to Address Book..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
-msgid "Move to Address Book..."
-msgstr "Move to Address Book..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copy"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-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
-msgid "Current View"
-msgstr "Current View"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"The addressbook backend for\n"
-"%s\n"
-"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
-#: calendar/gui/cal-search-bar.c:362
-msgid "Any Category"
-msgstr "Any Category"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistant"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistant Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Business Fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Business Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Business Phone 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Callback Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Car Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Categories"
-msgstr "Categories"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-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 "Surname"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "File As"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Forename"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Home Fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Home Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Home Phone 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Journal"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-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 "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Other Fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Other Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Primary Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Role"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Spouse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Title"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Unit"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Web Site"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "Width"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "Height"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-msgid "Has Focus"
-msgstr "Has Focus"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Field"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Field Name"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Text Model"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-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"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"There are no items to show in this view."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-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)"
@@ -2755,6 +2369,11 @@ msgstr "List Members"
 msgid "E-mail"
 msgstr "E-mail"
 
+#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
 #: addressbook/gui/widgets/eab-contact-display.c:301
 msgid "Position"
 msgstr "Position"
@@ -2790,14 +2409,30 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Blog"
 
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
 #: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "personal"
 msgstr "personal"
 
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Note"
+
 #: addressbook/gui/widgets/eab-contact-display.c:508
 msgid "Job Title"
 msgstr "Job Title"
 
+#: addressbook/gui/widgets/eab-contact-display.c:512
+#: 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:539
 msgid "Home page"
 msgstr "Home page"
@@ -2853,8 +2488,9 @@ 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
+#: 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:626 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
@@ -2980,7 +2616,7 @@ msgid "Error adding list"
 msgstr "Error adding list"
 
 #: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: addressbook/gui/widgets/eab-gui-util.c:651
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
@@ -2997,7 +2633,7 @@ msgid "Error removing list"
 msgstr "Error removing list"
 
 #: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: addressbook/gui/widgets/eab-gui-util.c:609
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
@@ -3033,35 +2669,35 @@ msgstr "Error saving %s: %s"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:569
+#: addressbook/gui/widgets/eab-gui-util.c:570
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:705
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: addressbook/gui/widgets/eab-gui-util.c:710
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:712
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:715
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:887
+#: addressbook/gui/widgets/eab-gui-util.c:888
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:890
+#: addressbook/gui/widgets/eab-gui-util.c:891
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -3079,6 +2715,16 @@ msgstr "(none)"
 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"
@@ -3125,6 +2771,377 @@ msgstr "Show Compact VCard"
 msgid "Save in addressbook"
 msgstr "Save in addressbook"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "No contacts"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contact"
+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.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "Query"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Error getting book view"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Model"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Error modifying card"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:161
+msgid "Name begins with"
+msgstr "Name begins with"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:162
+msgid "Email begins with"
+msgstr "Email begins with"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: calendar/gui/cal-search-bar.c:57
+msgid "Category is"
+msgstr "Category is"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: calendar/gui/cal-search-bar.c:50
+msgid "Any field contains"
+msgstr "Any field contains"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Advanced..."
+msgstr "Advanced..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Type"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:506
+msgid "Address Book"
+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
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard"
+msgstr "Save as VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
+msgid "New Contact..."
+msgstr "New Contact..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+msgid "New Contact List..."
+msgstr "New Contact List..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
+msgid "Go to Folder..."
+msgstr "Go to Folder..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
+msgid "Import..."
+msgstr "Import..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
+msgid "Search for Contacts..."
+msgstr "Search for Contacts..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
+msgid "Address Book Sources..."
+msgstr "Address Book Sources..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
+msgid "Pilot Settings..."
+msgstr "Pilot Settings..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Forward Contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+msgid "Send Message to Contact"
+msgstr "Send Message to Contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Print"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
+msgid "Print Envelope"
+msgstr "Print Envelope"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
+msgid "Copy to Address Book..."
+msgstr "Copy to Address Book..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
+msgid "Move to Address Book..."
+msgstr "Move to Address Book..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: 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"
+msgstr "Copy"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Paste"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1279
+msgid "Current View"
+msgstr "Current View"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1309
+#, c-format
+msgid ""
+"The addressbook backend for\n"
+"%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+"The addressbook backend for\n"
+"%s\n"
+"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
+#: calendar/gui/cal-search-bar.c:362
+msgid "Any Category"
+msgstr "Any Category"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistant"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Assistant Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Business Fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Business Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Business Phone 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Callback Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Car Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Categories"
+msgstr "Categories"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Company Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Surname"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "File As"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Forename"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Home Fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Home Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Home Phone 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Journal"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Manager"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Nickname"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Office"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Other Fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Other Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Primary Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Role"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Spouse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Title"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Unit"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Web Site"
+
+#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Width"
+
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Height"
+
+#: 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"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Field Name"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Text Model"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Max field name length"
+
+#: addressbook/gui/widgets/e-minicard-view.c:142
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+
+#: addressbook/gui/widgets/e-minicard-view.c:145
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"There are no items to show in this view."
+
+#: addressbook/gui/widgets/e-minicard-view.c:453
+msgid "Adapter"
+msgstr "Adapter"
+
+#: 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"
 msgstr "Card View"
@@ -3167,11 +3184,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"
@@ -3181,6 +3193,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"
@@ -3365,16 +3382,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"
@@ -3431,6 +3438,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."
@@ -3447,7 +3464,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"
 
@@ -3479,63 +3497,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:"
@@ -3633,6 +3594,10 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
+#: 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:164
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
@@ -3773,27 +3738,9 @@ msgstr "Whether to show times in 24h format instead of using am/pm"
 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:116 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1706
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
@@ -3819,58 +3766,58 @@ msgstr "Purge events older than"
 msgid "days"
 msgstr "days"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:431 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.
-#: 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:434 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1589 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:443 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-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:464 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:800
+#: calendar/gui/calendar-component.c:908
 #, 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:920
 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:954
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3878,51 +3825,56 @@ msgstr ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
 
-#: calendar/gui/calendar-component.c:1110
+#: calendar/gui/calendar-component.c:1062
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/calendar-component.c:1225
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1226
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1227
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1118
+#: calendar/gui/calendar-component.c:1233
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1234
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1235
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1126
+#: calendar/gui/calendar-component.c:1241
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1127
+#: calendar/gui/calendar-component.c:1242
 msgid "All _Day Appointment"
 msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:1128
+#: calendar/gui/calendar-component.c:1243
 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:1249
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1135
+#: calendar/gui/calendar-component.c:1250
 msgid "C_alendar"
 msgstr "C_alendar"
 
-#: calendar/gui/calendar-component.c:1136
+#: calendar/gui/calendar-component.c:1251
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
@@ -3952,6 +3904,26 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
+#: 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:408
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
@@ -4088,6 +4060,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:"
@@ -4126,10 +4099,98 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of 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 "_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:676 mail/em-composer-prefs.c:904
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4143,19 +4204,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:595 mail/em-composer-prefs.c:653
+#: mail/em-composer-prefs.c:683
 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:595 mail/em-composer-prefs.c:653
+#: mail/em-composer-prefs.c:683
 msgid "Enable"
 msgstr "Enable"
 
@@ -4392,86 +4453,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 "_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 "
@@ -4552,31 +4533,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"
@@ -4611,7 +4567,7 @@ 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
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -4625,6 +4581,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"
@@ -4863,9 +4844,9 @@ msgstr "_Start time:"
 #. an empty string is the same as 'None'
 #: 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
+#: calendar/gui/e-cal-model-tasks.c:618 composer/e-msg-composer.c:2110
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:805
+#: mail/mail-account-gui.c:1551 mail/mail-account-gui.c:2045
 #: 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
@@ -4893,7 +4874,7 @@ msgstr "_Delegate To..."
 #: 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
+#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:796
 #: 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
@@ -5165,24 +5146,17 @@ msgstr "_Discard Changes"
 msgid "Save Event"
 msgstr "Save Event"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 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"
-msgstr "Select destination %s"
-
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "calendar"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+msgid "_Destination"
+msgstr "_Destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "task list"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Task List"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5210,38 +5184,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:624 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:928
 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:622 calendar/gui/e-cal-model-tasks.c:697
 #: 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:926
 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:875
+#: mail/message-list.c:927
 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:620 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -5289,8 +5269,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:"
@@ -5434,101 +5415,52 @@ 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-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"
-
-#: 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-component-preview.c:71 mail/em-folder-view.c:2215
+#, c-format
+msgid "Click to open %s"
+msgstr "Click to open %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:750
+msgid "Untitled"
+msgstr "Untitled"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Start Date:"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Due Date:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#. 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: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"
+#: calendar/gui/e-cal-component-preview.c:247
+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: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:300
+msgid "Web Page:"
+msgstr "Web Page:"
 
-#: 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"
-
-#. 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%"
@@ -5574,6 +5506,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"
@@ -5584,7 +5525,7 @@ 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
+#: mail/em-folder-view.c:771 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
@@ -5594,7 +5535,7 @@ 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
+#: mail/em-folder-view.c:773 mail/em-popup.c:690 mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
@@ -5682,6 +5623,11 @@ 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"
@@ -5750,6 +5696,79 @@ msgstr "_Go to Date..."
 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:1674 camel/camel-gpg-context.c:1725
+#: 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:1034
+#: 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:1046
+#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Unknown"
+
+#: calendar/gui/e-cal-model.c:877
+msgid "Recurring"
+msgstr "Recurring"
+
+#: calendar/gui/e-cal-model.c:879
+msgid "Assigned"
+msgstr "Assigned"
+
+#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:980
+#: 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:881 calendar/gui/e-cal-model-tasks.c:980
+#: 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:572
+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.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5773,36 +5792,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: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"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view.c:1572 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.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view.c:1605 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)"
@@ -5911,10 +5930,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
@@ -6326,28 +6341,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, %d %B, %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-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.
-#: 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"
@@ -6408,7 +6401,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, %d %B, %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
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Enter the password for %s"
+
+#: calendar/gui/e-tasks.c:582 calendar/gui/gnome-cal.c:2021
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6417,19 +6437,19 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:643 calendar/gui/gnome-cal.c:2060
+#: calendar/gui/e-tasks.c:610 calendar/gui/gnome-cal.c:2060
 #, 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:684
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:740
+#: calendar/gui/e-tasks.c:707
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6438,22 +6458,31 @@ msgstr ""
 "Error opening %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:761
+#: calendar/gui/e-tasks.c:728
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:865
+#: calendar/gui/e-tasks.c:832
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:855
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:915
+#: calendar/gui/e-tasks.c:882
 msgid "Expunging"
 msgstr "Expunging"
 
+#: calendar/gui/e-tasks.c:958
+#: 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:637 calendar/gui/tasks-control.c:516
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tasks"
+
 #: calendar/gui/gnome-cal.c:1879
 #, c-format
 msgid "Loading appointments at %s"
@@ -6474,10 +6503,50 @@ msgstr "Opening %s"
 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:2897
 msgid "Purging"
 msgstr "Purging"
 
+#: 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: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/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6852,25 +6921,39 @@ 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
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d task"
+msgstr[1] "%d tasks"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:532
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d selected"
+msgstr[1] ", %d selected"
+
+#: calendar/gui/tasks-component.c:515
 #, 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:527
 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:565
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6878,27 +6961,27 @@ msgstr ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:793
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:733
+#: calendar/gui/tasks-component.c:794
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:734
+#: calendar/gui/tasks-component.c:795
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:740
+#: calendar/gui/tasks-component.c:801
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:741
+#: calendar/gui/tasks-component.c:802
 msgid "_Tasks Group"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:742
+#: calendar/gui/tasks-component.c:803
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
@@ -8668,33 +8751,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"
@@ -8726,6 +8782,33 @@ msgstr "Learning junk and/or non junk message(s)"
 msgid "Filtering new message(s)"
 msgstr "Filtering new message(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-gpg-context.c:712
 #, c-format
 msgid ""
@@ -8756,7 +8839,7 @@ msgstr ""
 
 #: 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:1624 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
@@ -8840,26 +8923,6 @@ msgstr "Encrypted content"
 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"
@@ -8880,6 +8943,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"
@@ -9733,17 +9816,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:629
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error storing `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:669
 #, 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:835 camel/camel-vee-folder.c:841
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
@@ -9771,10 +9854,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"
@@ -9805,6 +9890,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
@@ -9824,6 +9910,292 @@ msgstr ""
 msgid "Checklist"
 msgstr "Checklist"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Unexpected response from IMAP4 server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Cannot select folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Cannot select folder `%s': Bad command"
+
+#: 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
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 server %s unexpectedly disconnected: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr "Got BYE response"
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Cannot sync flags to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Cannot sync flags to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Cannot expunge folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Cannot expunge folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Cannot get message %s from folder `%s': No such message"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Cannot get message %s from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Cannot append message to folder `%s': Unknown error"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Cannot append message to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+
+#: 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
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:424
+#, 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:426
+#, 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: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/imap4/camel-imap4-store.c:210
+#: 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/imap4/camel-imap4-store.c:222
+#: 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/imap4/camel-imap4-store.c:261
+#, 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: Server does not support "
+"STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: 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/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:1089
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPlease enter the IMAP password for %s on host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Cannot create folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Cannot create folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete folder `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Cannot delete folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1032
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1034
+msgid "Bad command"
+msgstr "Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1095
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Cannot subscribe to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1144
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Cannot unsubscribe from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Unexpected token in response from IMAP server %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr "No data"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP server %s 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
@@ -9837,13 +10209,6 @@ msgstr "Operation cancelled"
 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
@@ -9974,23 +10339,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"
@@ -10011,48 +10359,6 @@ 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/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
@@ -10916,8 +11222,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:1223
+#: composer/e-msg-composer.c:1244
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
@@ -11361,7 +11667,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:404
 msgid "attachment"
 msgstr "attachment"
 
@@ -11405,6 +11711,100 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
+#: composer/e-msg-composer.c:703
+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:709
+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:1281
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: composer/e-msg-composer.c:1289
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: composer/e-msg-composer.c:1559
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1589
+msgid "Open file"
+msgstr "Open file"
+
+#: composer/e-msg-composer.c:1996 mail/mail-account-gui.c:1472
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2095
+msgid "Signature:"
+msgstr "Signature:"
+
+#: composer/e-msg-composer.c:2296
+#, 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:2325
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Hide _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2328 composer/e-msg-composer.c:3232
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Show _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2345 composer/e-msg-composer.c:3111
+#: composer/e-msg-composer.c:3112
+msgid "Compose a message"
+msgstr "Compose a message"
+
+#: composer/e-msg-composer.c:3145
+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:3173
+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:3277
+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:4282
+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"
@@ -11485,100 +11885,6 @@ 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"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Signature:"
-
-#: 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"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
-
-#: 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)"
-
-#: 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"
-
-#: composer/e-msg-composer.c:3137
-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: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/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/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>"
-
 #: composer/mail-composer-errors.xml.in.h:1
 msgid "${1}"
 msgstr "${1}"
@@ -11817,7 +12123,7 @@ msgstr ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 
-#: e-util/e-dialog-utils.c:251
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.in.h:7
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
@@ -12073,63 +12379,10 @@ msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: mail/mail-account-gui.c:1338
 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 "    "
@@ -12218,6 +12471,55 @@ msgstr "with all local folders"
 msgid "years"
 msgstr "years"
 
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
+#: 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:925 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:926 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:746
+msgid "Rule name:"
+msgstr "Rule name:"
+
+#: 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"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12347,7 +12649,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:804
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12384,7 +12686,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"
 
@@ -12453,9 +12755,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:747 mail/em-format-html.c:1542
+#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subject"
@@ -12520,101 +12822,61 @@ msgstr "Virtual _Folders"
 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:1049
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:908
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:954
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:974
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:883
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
+
+#: mail/em-composer-utils.c:1494
+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:1504
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+
+#: mail/em-folder-browser.c:143
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
 
+#: mail/em-folder-browser.c:835 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:540
+#: mail/mail-component.c:583
+msgid "Mail"
+msgstr "Mail"
+
 #: mail/em-folder-properties.c:120
 msgid "Folder properties"
 msgstr "Folder properties"
@@ -12646,33 +12908,16 @@ 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/mail-component.c:732
+#: 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: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
 #, c-format
 msgid "Moving folder %s"
@@ -12698,7 +12943,7 @@ 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-view.c:673 mail/em-folder-view.c:687
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Select folder"
@@ -12708,7 +12953,7 @@ msgstr "Select folder"
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2334 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2334 mail/mail-component.c:732
 msgid "Create folder"
 msgstr "Create folder"
 
@@ -12748,161 +12993,325 @@ msgstr "_Rename"
 msgid "_Properties..."
 msgstr "_Properties..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:851
+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:468 mail/em-folder-tree-model.c:777
+msgid "Loading..."
+msgstr "Loading..."
+
 #. { 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:772 mail/em-popup.c:689
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:774
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:777 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:778 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:779 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
+#: mail/em-folder-view.c:780 mail/em-popup.c:813
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:783
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:784
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:785
 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:788 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:789
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:790
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:791
 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:792 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:793 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:797
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:800
 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:801 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:809
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:812
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:813
 msgid "F_ilter Junk"
 msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:816
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:817
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:818
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:819
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:820
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:821
+#: mail/em-folder-view.c:822
 msgid "VFolder on Thread"
 msgstr "VFolder on Thread"
 
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:826
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:827
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:828
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:829
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
-#: mail/em-folder-view.c:830
+#: mail/em-folder-view.c:831
 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:1614 mail/em-folder-view.c:1652
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1688
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:1951
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2210
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: mail/em-folder-view.c:2214
+#: mail/em-format.c:742 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "From"
+
+#: mail/em-format.c:743 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:85
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format.c:744 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:86 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "To"
+
+#: mail/em-format.c:745 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:87
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:746 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:88
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/em-format.c:748 mail/em-format-html.c:1586 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
+
+#: mail/em-format.c:749 mail/em-format-html.c:1607 mail/em-mailer-prefs.c:91
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:986
 #, c-format
-msgid "Click to open %s"
-msgstr "Click to open %s"
+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-format-html.c:462 mail/em-format-html.c:464
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:646
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:647
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:648
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: mail/em-format-html.c:572 mail/em-format-html-display.c:649
+msgid "Valid signature, cannot verify sender"
+msgstr "Valid signature, cannot verify sender"
+
+#: mail/em-format-html.c:578 mail/em-format-html-display.c:655
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: mail/em-format-html.c:579 mail/em-format-html-display.c:656
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: mail/em-format-html.c:580 mail/em-format-html-display.c:657
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: mail/em-format-html.c:581 mail/em-format-html-display.c:658
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: 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"
+
+#. pseudo-header
+#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:935
+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>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -12910,10 +13319,6 @@ 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
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -12922,10 +13327,6 @@ 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
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -12934,10 +13335,6 @@ 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
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
@@ -12946,10 +13343,6 @@ 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
-msgid "Valid signature, cannot verify sender"
-msgstr "Valid signature, cannot verify sender"
-
 #: mail/em-format-html-display.c:649
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -12958,10 +13351,6 @@ 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
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -12970,10 +13359,6 @@ 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
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -12984,10 +13369,6 @@ 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
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
@@ -12996,10 +13377,6 @@ 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
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13043,141 +13420,23 @@ msgstr "_Hide"
 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
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:102
 msgid "Every time"
 msgstr "Every time"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:103
 msgid "Once per day"
 msgstr "Once per day"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:104
 msgid "Once per week"
 msgstr "Once per week"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:105
 msgid "Once per month"
 msgstr "Once per month"
 
@@ -13222,27 +13481,27 @@ 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..."
@@ -13268,42 +13527,28 @@ msgstr "Please select a server."
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:98
 msgid "Don't show this message again."
 msgstr "Don't show this message again."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:288
 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-%m-%d at %H:%M %%+05d, %%s wrote:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:402
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:505
 msgid "Save Message..."
 msgstr "Save Message..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:554
 msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:989
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -13778,33 +14023,59 @@ 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 "Composer Preferences"
+msgstr "Composer Preferences"
 
-#: 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 ""
+"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:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
+#: 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/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 your email accounts here"
+msgstr "Configure your email accounts 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 "Evolution Mail"
+msgstr "Evolution Mail"
 
-#: 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 accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
 
-#: 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 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: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/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13812,14 +14083,14 @@ 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/evolution-outlook-importer.c:226
 #: mail/importers/netscape-importer.c:1221 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/evolution-outlook-importer.c:228
 #: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
@@ -13849,18 +14120,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"
@@ -13975,120 +14274,123 @@ msgstr "Pine"
 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:957 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:961 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:965 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:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:318
+#: mail/mail-autofilter.c:317
 #, c-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
 
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:493
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:495
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:518
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:520
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:522
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:526
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:528
 #, 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:684
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:871
+#: mail/mail-component.c:872
 msgid "URI of the mail source that the view will display"
 msgstr "URI of the mail source that the view will display"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:899
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: mail/mail-config.c:977 mail/mail-config.c:981
+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 "
@@ -14098,12 +14400,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."
@@ -14111,15 +14413,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."
@@ -14127,11 +14429,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 "
@@ -14145,14 +14447,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,7 +15093,7 @@ msgstr "Are you sure you want to send a message without a subject?"
 msgid "Because \"{0}\"."
 msgstr "Because \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:10
+#: mail/mail-errors.xml.in.h:10 widgets/misc/e-system-errors.xml.in.h:2
 msgid "Because \"{1}\"."
 msgstr "Because \"{1}\"."
 
@@ -15158,20 +15452,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"
@@ -15180,115 +15474,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] "Retreiving %d messages"
 
-#: 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 messages"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15297,7 +15591,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"
@@ -15306,11 +15600,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"
@@ -15319,17 +15613,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"
@@ -15393,24 +15687,24 @@ msgstr "Updating..."
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "User cancelled 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"
 
@@ -15426,113 +15720,113 @@ msgstr "Enter a name for this signature."
 msgid "Name:"
 msgstr "Name:"
 
-#: mail/mail-tools.c:114
+#: mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Could not create spool directory `%s': %s"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:143
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Trying to movemail a non-mbox source `%s'"
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:278
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:280
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: mail/mail-tools.c:319
+#: mail/mail-tools.c:321
 #, c-format
 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
+#: mail/mail-vfolder.c:206
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Updating vfolders for uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:921
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:960
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1044
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:916
 msgid "Unseen"
 msgstr "Unseen"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:917
 msgid "Seen"
 msgstr "Seen"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:918
 msgid "Answered"
 msgstr "Answered"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:919
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:920
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:924
 msgid "Lowest"
 msgstr "Lowest"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:925
 msgid "Lower"
 msgstr "Lower"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:929
 msgid "Higher"
 msgstr "Higher"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:930
 msgid "Highest"
 msgstr "Highest"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1249
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1256
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1265
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1277
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1285
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1287
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3105
+#: mail/message-list.c:3114
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -15564,43 +15858,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"
 
@@ -15644,18 +15938,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"
@@ -15718,6 +16000,33 @@ msgstr "mail"
 msgid "Brought to you by"
 msgstr "Brought to you by"
 
+#: 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-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Untitled)"
@@ -15901,6 +16210,22 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
+#: 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-window-commands.c:63
 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."
@@ -15934,49 +16259,6 @@ msgstr "_Work Offline"
 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"
@@ -16046,6 +16328,42 @@ 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
+msgid "C_alendar:"
+msgstr "C_alendar:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Contacts:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Mail:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Tasks:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Folder _type:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Open Other User's Folder"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Account:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Folder Name:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_User:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
@@ -16088,6 +16406,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. "
@@ -16476,11 +16806,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"
@@ -16671,6 +16996,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"
@@ -16779,8 +17109,8 @@ msgid "Select all contacts"
 msgstr "Select all contacts"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
-msgstr "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
+msgstr "Send a message to the selected contacts."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
@@ -16810,8 +17140,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"
@@ -17285,6 +17615,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"
@@ -17697,16 +18037,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"
@@ -18318,6 +18648,32 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
+#: widgets/misc/e-error.c:119
+msgid "Evolution Error"
+msgstr "Evolution Error"
+
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:117
+msgid "Evolution Warning"
+msgstr "Evolution Warning"
+
+#: widgets/misc/e-error.c:116
+msgid "Evolution Information"
+msgstr "Evolution Information"
+
+#: widgets/misc/e-error.c:118
+msgid "Evolution Query"
+msgstr "Evolution Query"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:430
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expanded"
@@ -18431,6 +18787,30 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Find _Now"
 
+#: widgets/misc/e-system-errors.xml.in.h:1
+msgid "Because \"{1}\""
+msgstr "Because \"{1}\""
+
+#: widgets/misc/e-system-errors.xml.in.h:3
+msgid "Cannot open file \"{0}\"."
+msgstr "Cannot open file \"{0}\"."
+
+#: widgets/misc/e-system-errors.xml.in.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Cannot save file \"{0}\"."
+
+#: widgets/misc/e-system-errors.xml.in.h:5
+msgid "Do you wish to overwrite it?"
+msgstr "Do you wish to overwrite it?"
+
+#: widgets/misc/e-system-errors.xml.in.h:6
+msgid "File exists \"{0}\"."
+msgstr "File exists \"{0}\"."
+
+#: widgets/misc/e-system-errors.xml.in.h:8
+msgid "_Overwrite"
+msgstr "_Overwrite"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18441,12 +18821,18 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Select destination %s"
+#~ msgstr "Select destination %s"
+
+#~ msgid "calendar"
+#~ msgstr "calendar"
+
+#~ msgid "task list"
+#~ msgstr "task list"
+
 #~ msgid "Alerts"
 #~ msgstr "Alerts"
 
-#~ msgid "Task List"
-#~ msgstr "Task List"
-
 #~ msgid "Time"
 #~ msgstr "Time"
 
@@ -18682,9 +19068,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Group:"
 #~ msgstr "Group:"
 
-#~ msgid "New Address Book"
-#~ msgstr "New Address Book"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -18791,29 +19174,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Save Contact as VCard"
 #~ msgstr "Save Contact as VCard"
 
-#~ msgid "Start Date:"
-#~ msgstr "Start Date:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Due Date:"
-
-#~ msgid "Priority:"
-#~ msgstr "Priority:"
-
-#~ msgid "Web Page:"
-#~ msgstr "Web Page:"
-
-#~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-
-#~ msgid "UID of the contacts source that the view will display"
-#~ msgstr "UID of the contacts source that the view will display"
-
-#~ msgid "The URI that the address book will display"
-#~ msgstr "The URI that the address book will display"
-
 #~ msgid " B_usiness:"
 #~ msgstr " B_usiness:"
 
@@ -18994,9 +19354,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "The view showing when the calendar starts"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Enter the password for %s"
-
 #~ msgid "New task list"
 #~ msgstr "New task list"
 
@@ -19052,33 +19409,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Cannot find the specified shared folder."
 
-#~ msgid "C_alendar:"
-#~ msgstr "C_alendar:"
-
-#~ msgid "_Contacts:"
-#~ msgstr "_Contacts:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Mail:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Tasks:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Folder _type:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Open Other User's Folder"
-
-#~ msgid "_Account:"
-#~ msgstr "_Account:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Folder Name:"
-
-#~ msgid "_User:"
-#~ msgstr "_User:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Create a new window"
 
@@ -19100,74 +19430,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Address Book Sources"
 #~ msgstr "Address Book Sources"
 
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Unexpected response from IMAP server %s: %s"
-
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Cannot select folder `%s': Invalid mailbox name"
-
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Cannot select folder `%s': Bad command"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "IMAP server %s unexpectedly disconnected: %s"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Got BYE response"
-
-#~ 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: Server does not "
-#~ "support STARTTLS"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sPlease enter the IMAP password for %s on host %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Cannot authenticate to IMAP server %s using %s"
-
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Cannot create folder `%s': Invalid mailbox name"
-
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Cannot create folder `%s': Bad command"
-
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Cannot delete folder `%s': Special folder"
-
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Cannot delete folder `%s': Invalid mailbox name"
-
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Cannot delete folder `%s': Bad command"
-
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
-
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Cannot subscribe to folder `%s': Bad command"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Cannot unsubscribe from folder `%s': Bad command"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Unexpected token in response from IMAP server %s: "
-
-#~ msgid "No data"
-#~ msgstr "No data"
-
 #~ msgid "<b>Filter Rules</b>"
 #~ msgstr "<b>Filter Rules</b>"
 
@@ -19289,10 +19551,6 @@ msgstr "%s (%d%% complete)"
 #~ msgstr "Could not initialise Bonobo"
 
 #, fuzzy
-#~ msgid "Evolution Error"
-#~ msgstr "Cannot initialise the Evolution shell."
-
-#, fuzzy
 #~ msgid "Could not create a directory for the new addressbook."
 #~ msgstr "Cannot initialise Evolution's mail component."