Updated Canadian English translation.

	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=26068

2 files changed, 1052 insertions, 979 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 1bbf29db52..71c7798843 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-24  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2004-05-23  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
diff --git a/po/en_CA.po b/po/en_CA.po
index a1169ef37d..11c31fcebc 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.5\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
-"PO-Revision-Date: 2004-05-01 01:25-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-24 14:56-0700\n"
+"PO-Revision-Date: 2004-05-24 15:07-0700\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
@@ -54,13 +54,13 @@ msgstr " card"
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Could not load addressbook"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
@@ -115,9 +115,9 @@ msgstr "_Contacts Group"
 msgid "Create a new contacts group"
 msgstr "Create a new contacts group"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
-msgstr ""
+msgstr "Failed upgrading Addressbook settings or folders."
 
 #: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
@@ -148,47 +148,51 @@ msgid "Server did not respond with valid schema information"
 msgstr "Server did not respond with valid schema information"
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrating..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#. On This Computer is always first and VFolders is always last
+#: addressbook/gui/component/addressbook-migrate.c:508
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:247 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:516
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:524
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:652
 msgid "LDAP Servers"
 msgstr "LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:772
 msgid "Autocompletion Settings"
 msgstr "Autocompletion Settings"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -200,7 +204,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -210,7 +214,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1171
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -220,7 +224,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1181
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -230,15 +234,22 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
+#: addressbook/gui/component/addressbook-migrate.c:1194
+msgid ""
+"Some fields are no longer representable in the contact editor. Please wait "
+"while Evolution copies those fields to the 'Notes' field..."
+msgstr ""
+"Some fields are no longer representable in the contact editor. Please wait "
+"while Evolution copies those fields to the 'Notes' field..."
+
 #: addressbook/gui/component/addressbook-view.c:674
-#, fuzzy, c-format
+#, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
+msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
 
 #: addressbook/gui/component/addressbook-view.c:761
-#, fuzzy
 msgid "New Address Book"
-msgstr "Address Book"
+msgstr "New Address Book"
 
 #: addressbook/gui/component/addressbook-view.c:762
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
@@ -256,13 +267,9 @@ msgstr "Delete"
 msgid "Properties..."
 msgstr "Properties..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
+#. Create the contacts group
 #: addressbook/gui/component/addressbook-view.c:1002
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contacts"
@@ -289,16 +296,15 @@ msgstr "URI for the folder last used in the select names dialog"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "*Control*F2"
-msgstr ""
+msgstr "*Control*F2"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
 msgid "C_ontacts"
-msgstr "Contacts"
+msgstr "C_ontacts"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
@@ -337,9 +343,8 @@ msgid "Evolution folder settings configuration control"
 msgstr "Evolution folder settings configuration control"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
 msgid "Manage your S/MIME certificates here"
-msgstr "Manager your S/Mime certificates here"
+msgstr "Manage your S/MIME certificates here"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
@@ -360,7 +365,7 @@ msgstr "  S_how Supported Bases "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: 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
@@ -428,7 +433,7 @@ msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
 #: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Always"
 
@@ -488,12 +493,12 @@ msgstr "Find Possible Search Bases"
 #: 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
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
 #: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Never"
 
@@ -678,7 +683,7 @@ msgid "Using email address"
 msgstr "Using email address"
 
 #: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
@@ -704,7 +709,7 @@ msgid "_Log in method:"
 msgstr "_Log in method:"
 
 #: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -751,7 +756,7 @@ msgstr "general-tab"
 #: 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
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
 
@@ -869,7 +874,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:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 #: addressbook/gui/widgets/eab-contact-display.c:342
 #: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
@@ -905,7 +910,7 @@ msgid "Company:"
 msgstr "Company:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 #: 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
@@ -913,7 +918,7 @@ msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:519
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -934,74 +939,72 @@ msgid "Full _Name..."
 msgstr "Full _Name..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Home"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#, fuzzy
 msgid "Home Page:"
-msgstr "Home page"
+msgstr "Home Page:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Job title:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "Location:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Manager:"
 msgstr "Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Notes:"
 msgstr "Notes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "PO Box:"
-msgstr "_PO Box:"
+msgstr "PO Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "Personal Information"
 msgstr "Personal information"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Profession:"
 msgstr "Profession:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "State/Province:"
 msgstr "State/Province:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Title:"
+msgstr "Title:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Wants to receive HTML mail"
@@ -1012,10 +1015,10 @@ msgstr "Webcam:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Work"
 
@@ -1043,7 +1046,7 @@ msgstr "item7"
 msgid "item8"
 msgstr "item8"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1051,7 +1054,7 @@ msgstr ""
 "Are you sure you want\n"
 "to delete these contacts?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1066,7 +1069,7 @@ msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
@@ -2047,85 +2050,103 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/widgets/eab-contact-display.c:345
 #: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/widgets/eab-contact-display.c:347
 #: addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
 #: addressbook/gui/widgets/eab-contact-display.c:346
 #: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/widgets/eab-contact-display.c:344
 #: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:2294
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2302
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2379
 msgid "Please select an image for this contact"
-msgstr "Please select among the following options"
+msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2383
 msgid "No image"
-msgstr "Niger"
+msgstr "No image"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2560
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2607
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr ""
+"The contact data is invalid:\n"
+"\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2704
+#: addressbook/gui/contact-editor/e-contact-editor.c:2728
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "_Discard"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2158,7 +2179,7 @@ msgid "_Edit Full"
 msgstr "_Edit Full"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Full Name:"
 
@@ -2631,10 +2652,6 @@ msgstr "This query did not complete successfully."
 msgid "Do you want to save changes?"
 msgstr "Do you want to save changes?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Discard"
-
 #: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Error adding list"
@@ -2853,7 +2870,7 @@ 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-list-view.c:250
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
@@ -2864,11 +2881,10 @@ msgstr "Address Book"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
-#, fuzzy
 msgid "Save as VCard..."
-msgstr "Save as VCard"
+msgstr "Save as VCard..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
@@ -3067,7 +3083,7 @@ 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-list-view.c:257
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Role"
@@ -3175,17 +3191,17 @@ msgstr "Card View"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 msgid "Reflow Test"
 msgstr "Reflow Test"
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
 msgid "This should test the reflow canvas item"
 msgstr "This should test the reflow canvas item"
 
@@ -3209,12 +3225,12 @@ msgstr "Evolution VCard importer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Print contacts"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Print contact"
 
@@ -3463,15 +3479,19 @@ 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
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 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-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of addressbooks"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "failed to open book"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3737,7 +3757,7 @@ msgstr "Weekday the week starts on"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Whether or not to use the notification tray for display alarms"
-msgstr ""
+msgstr "Whether or not to use the notification tray for displaying alarms"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
@@ -3797,6 +3817,10 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3834,9 +3858,8 @@ msgid "New Calendar"
 msgstr "New Calendar"
 
 #: calendar/gui/calendar-component.c:623
-#, fuzzy
 msgid "Failed upgrading calendars."
-msgstr "Loading calendar..."
+msgstr "Failed upgrading calendars."
 
 #: calendar/gui/calendar-component.c:917
 #, c-format
@@ -4061,7 +4084,7 @@ msgstr "Play a sound"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
-msgstr ""
+msgstr "Pop up an alert"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Reminders"
@@ -4078,7 +4101,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
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
 
@@ -4160,7 +4183,7 @@ msgstr "C_olour:"
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Pick a colour"
 
@@ -4302,7 +4325,7 @@ msgid "Display"
 msgstr "Display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "E_nable"
 
@@ -4312,7 +4335,7 @@ msgstr "Free/Busy Publishing"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:557
 msgid "Friday"
 msgstr "Friday"
 
@@ -4326,7 +4349,7 @@ msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:553
 msgid "Monday"
 msgstr "Monday"
 
@@ -4336,7 +4359,7 @@ msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:558
 msgid "Saturday"
 msgstr "Saturday"
 
@@ -4350,7 +4373,7 @@ msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:552
 msgid "Sunday"
 msgstr "Sunday"
 
@@ -4364,7 +4387,7 @@ msgstr "T_hu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:556
 msgid "Thursday"
 msgstr "Thursday"
 
@@ -4378,7 +4401,7 @@ msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:554
 msgid "Tuesday"
 msgstr "Tuesday"
 
@@ -4388,7 +4411,7 @@ msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:555
 msgid "Wednesday"
 msgstr "Wednesday"
 
@@ -4421,7 +4444,7 @@ msgid "_Day begins:"
 msgstr "_Day begins:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4859,12 +4882,17 @@ msgid "_Start time:"
 msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4891,7 +4919,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:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4899,7 +4927,7 @@ msgid "_Delete"
 msgstr "_Delete"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Attendee"
@@ -4935,14 +4963,14 @@ msgid "Member"
 msgstr "Member"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-list-view.c:271
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
@@ -5164,19 +5192,16 @@ msgid "Save Event"
 msgstr "Save Event"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-#, fuzzy
 msgid "Select destination"
-msgstr "Select destination %s"
+msgstr "Select destination"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
-#, fuzzy
 msgid "_Destination"
-msgstr "Destination folder:"
+msgstr "_Destination"
 
 #: calendar/gui/dialogs/select-source-dialog.c:88
-#, fuzzy
 msgid "Task List"
-msgstr "New Task List"
+msgstr "Task List"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5213,7 +5238,7 @@ msgstr "Completed"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "High"
 
@@ -5227,14 +5252,14 @@ msgstr "In Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5291,8 +5316,8 @@ msgstr "Con_fidential"
 
 #: 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
+#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description:"
 
@@ -5446,30 +5471,26 @@ msgstr "Untitled"
 
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
-#, fuzzy
 msgid "Start Date:"
-msgstr "Start Date"
+msgstr "Start Date:"
 
 #: calendar/gui/e-cal-component-preview.c:216
-#, fuzzy
 msgid "Due Date:"
-msgstr "_Due date:"
+msgstr "Due Date:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:944
 msgid "Status:"
 msgstr "Status:"
 
 #: calendar/gui/e-cal-component-preview.c:247
-#, fuzzy
 msgid "Priority:"
-msgstr "_Priority:"
+msgstr "Priority:"
 
 #: calendar/gui/e-cal-component-preview.c:300
-#, fuzzy
 msgid "Web Page:"
-msgstr "_Web Page:"
+msgstr "Web Page:"
 
 #: 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
@@ -5559,7 +5580,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:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
@@ -5582,8 +5603,8 @@ msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
 #: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -5731,9 +5752,9 @@ 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-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-meeting-list-view.c:145
+#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5759,13 +5780,13 @@ msgid "Assigned"
 msgstr "Assigned"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Yes"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
@@ -5796,12 +5817,20 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5832,6 +5861,10 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5839,6 +5872,9 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5849,102 +5885,101 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:586
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:597
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every day"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:602
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every week"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:604
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Every week on "
 msgstr[1] "Every week on "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:612
 msgid " and "
 msgstr " and "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:619
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:632
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:639
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every month"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:643
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every year"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:654
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "a total of %d time"
 msgstr[1] " a total of %d times"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:663
 msgid ", ending on "
 msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:687
 msgid "<b>Starts:</b> "
 msgstr "<b>Starts:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:697
 msgid "<b>Ends:</b> "
 msgstr "<b>Ends:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:717
 msgid "<b>Completed:</b> "
 msgstr "<b>Completed:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:727
 msgid "<b>Due:</b> "
 msgstr "<b>Due:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:782
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5952,301 +5987,301 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>None</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Update"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Accept"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Decline"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancellation"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Task Cancellation"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1529
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1763
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1819
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1831
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1850
 msgid "There was an error on the CORBA system\n"
 msgstr "There was an error on the CORBA system\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1853
 msgid "Object could not be found\n"
 msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1856
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "You don't have the right permissions to update the calendar\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1862
 msgid "Attendee status could not be updated!\n"
 msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1893
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -6292,7 +6327,7 @@ msgid "Chair Persons"
 msgstr "Chair Persons"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:480
 msgid "Required Participants"
 msgstr "Required Participants"
 
@@ -6304,57 +6339,57 @@ msgstr "Optional Participants"
 msgid "Resources"
 msgstr "Resources"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Group"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resource"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Room"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Chair"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentative"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegated"
@@ -6432,6 +6467,10 @@ msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.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
@@ -6440,15 +6479,19 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #: calendar/gui/e-pub-utils.c:300
-#, fuzzy, c-format
+#, c-format
 msgid "Enter the password for %s"
-msgstr "Enter the password for `%s'"
+msgstr "Enter the password for %s"
 
 #: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
@@ -6531,11 +6574,11 @@ msgstr "Purging"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "*Control*F3"
-msgstr ""
+msgstr "*Control*F3"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "*Control*F4"
-msgstr ""
+msgstr "*Control*F4"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
@@ -6570,9 +6613,8 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution's Tasks component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
 msgid "_Calendars"
-msgstr "Calendars"
+msgstr "_Calendars"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 #: views/tasks/galview.xml.h:3
@@ -6725,19 +6767,19 @@ msgstr "On The Web"
 #. FIXME: set proper domain/code
 #: calendar/gui/migration.c:708 calendar/gui/migration.c:840
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: calendar/gui/migration.c:737
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr "Unable to open the calendar '%s'."
+msgstr "Unable to migrate calendar `%s'"
 
 #. FIXME: domain/code
 #: calendar/gui/migration.c:869
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "Unable to open tasks in '%s'."
+msgstr "Unable to migrate tasks `%s'"
 
 #: calendar/gui/print.c:489
 msgid "1st"
@@ -6980,23 +7022,22 @@ msgid "New Task List"
 msgstr "New Task List"
 
 #: calendar/gui/tasks-component.c:398
-#, fuzzy, c-format
+#, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d total"
-msgstr[1] "%d total"
+msgstr[0] "%d task"
+msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
-#, fuzzy, c-format
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d selected"
 msgstr[1] ", %d selected"
 
 #: calendar/gui/tasks-component.c:447
-#, fuzzy
 msgid "Failed upgrading tasks."
-msgstr "Loading tasks"
+msgstr "Failed upgrading tasks."
 
 #: calendar/gui/tasks-component.c:526
 #, c-format
@@ -8801,12 +8842,12 @@ msgstr "Error executing filter search: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Unsupported operation: append message: for %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Unsupported operation: search by expression: for %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Unsupported operation: search by uids: for %s"
@@ -8819,11 +8860,15 @@ msgstr "Moving messages"
 msgid "Copying messages"
 msgstr "Copying messages"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Learning junk"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Learning non-junk"
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Filtering new message(s)"
 
@@ -8851,21 +8896,19 @@ msgstr "(match-all) requires a single bool result"
 
 #: camel/camel-folder-search.c:755
 msgid "(match-threads) not allowed inside match-all"
-msgstr ""
+msgstr "(match-threads) not allowed inside match-all"
 
 #: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
 msgid "(match-threads) requires a match type string"
-msgstr ""
+msgstr "(match-threads) requires a match type string"
 
 #: camel/camel-folder-search.c:785
-#, fuzzy
 msgid "(match-threads) expects an array result"
-msgstr "(match-all) requires a single bool result"
+msgstr "(match-threads) expects an array result"
 
 #: camel/camel-folder-search.c:791
-#, fuzzy
 msgid "(match-threads) requires the folder set"
-msgstr "(match-all) requires a single bool result"
+msgstr "(match-threads) requires the folder set"
 
 #: camel/camel-folder-search.c:880
 #, c-format
@@ -8902,7 +8945,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
@@ -9279,7 +9322,7 @@ msgstr "The referenced credentials have expired."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1243
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9476,9 +9519,8 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
 #: camel/camel-smime-context.c:354
-#, fuzzy
 msgid "Cannot add encryption certificate"
-msgstr "Cannot add add encryption certificate"
+msgstr "Cannot add encryption certificate"
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
@@ -9557,14 +9599,12 @@ msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
 #: camel/camel-smime-context.c:628
-#, fuzzy
 msgid "Certificate only message, cannot verify certificates"
-msgstr "Certficate only message, cannot verify certificates"
+msgstr "Certificate only message, cannot verify certificates"
 
 #: camel/camel-smime-context.c:631
-#, fuzzy
 msgid "Certificate only message, certificates imported and verified"
-msgstr "Certficate only message, certificates imported and verified"
+msgstr "Certificate only message, certificates imported and verified"
 
 #: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
@@ -9642,40 +9682,40 @@ msgstr "import keys: unimplemented"
 msgid "export keys: unimplemented"
 msgstr "export keys: unimplemented"
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Cannot get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:245
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Cannot create folder `%s': folder exists"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:299
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:323
-#, fuzzy, c-format
+#: camel/camel-store.c:327
+#, c-format
 msgid "Cannot create folder: %s: folder exists"
-msgstr "Cannot create folder `%s': folder exists"
+msgstr "Cannot create folder: %s: folder exists"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:391 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:441 camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:813
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -9952,24 +9992,24 @@ msgstr "Address Book And Calendar"
 msgid "Post Office Agent SOAP Port:"
 msgstr "Post Office Agent SOAP Port:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: 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
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Password"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9982,104 +10022,92 @@ msgid "Checklist"
 msgstr "Checklist"
 
 #: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Unexpected response from IMAP server: %s"
+msgstr "Unexpected response from IMAP4 server %s: %s"
 
 #: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder: %s: Invalid operation"
+msgstr "Cannot select folder `%s': Invalid mailbox name"
 
 #: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot select folder `%s': Bad command"
-msgstr "Cannot get folder `%s': %s"
+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
-#, fuzzy, c-format
+#, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Server unexpectedly disconnected: %s"
+msgstr "IMAP4 server %s unexpectedly disconnected: %s"
 
 #: camel/providers/imap4/camel-imap4-engine.c:1145
 msgid "Got BYE response"
-msgstr ""
+msgstr "Got BYE response"
 
 #: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Cannot get folder `%s': %s"
+msgstr "Cannot sync flags to folder `%s': Unknown"
 
 #: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Cannot create folder `%s': %s"
+msgstr "Cannot sync flags to folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Cannot get folder `%s': %s"
+msgstr "Cannot expunge folder `%s': Unknown"
 
 #: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Cannot get folder `%s': %s"
+msgstr "Cannot expunge folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgstr "Cannot get message %s from folder `%s': No such message"
 
 #: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgstr "Cannot get message %s from folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Cannot append message to mh folder: %s: %s"
+msgstr "Cannot append message to folder `%s': Unknown error"
 
 #: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Cannot append message to mh folder: %s: %s"
+msgstr "Cannot append message to folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
 
 #: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 
 #: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+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
@@ -10103,21 +10131,18 @@ msgid "Namespace"
 msgstr "Namespace"
 
 #: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
 msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
+msgstr "IMAPv4rev1"
 
 #: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
 msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For reading and storing mail on IMAP servers."
+msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL!!"
 
 #: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
-"This option will connect to the IMAP server using a plaintext password."
+"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:429
@@ -10133,8 +10158,8 @@ msgstr "IMAP service for %s on %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:572
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -10145,15 +10170,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Could not connect to %s (port %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL unavailable"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/imap/camel-imap-store.c:846
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10162,15 +10187,17 @@ msgid "Connection cancelled"
 msgstr "Connection cancelled"
 
 #: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to connect to IMAP server %s in secure mode: Server does not support "
 "STARTTLS"
-msgstr "Failed to connect to IMAP server %s in secure mode: %s"
+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:649
 #: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:711
 #, 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"
@@ -10179,36 +10206,35 @@ msgstr "Failed to connect to IMAP server %s in secure mode: %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:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
 msgid "Unknown error"
 msgstr "Unknown error"
 
 #: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 
 #: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPlease enter the SMTP 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
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Failed to authenticate on POP server %s: %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Cannot get folder `%s': %s"
+msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1890
+#: camel/providers/imap/camel-imap-store.c:2268
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10216,83 +10242,82 @@ msgstr ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 
 #: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Cannot rename folder: %s: Invalid operation"
+msgstr "Cannot create folder `%s': Invalid mailbox name"
 
 #: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': Bad command"
-msgstr "Cannot create folder `%s': %s"
+msgstr "Cannot create folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot delete folder `%s': Special folder"
-msgstr "Cannot delete folder: %s: No such folder"
+msgstr "Cannot delete folder `%s': Special folder"
 
 #: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder: %s: Invalid operation"
+msgstr "Cannot delete folder `%s': Invalid mailbox name"
 
 #: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot delete folder `%s': Bad command"
-msgstr "Cannot delete folder: %s: Invalid operation"
+msgstr "Cannot delete folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-store.c:1037
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
+msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
 msgid "Bad command"
-msgstr "Command:"
+msgstr "Bad command"
 
 #: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder: %s: Invalid operation"
+msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
 
 #: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Cannot create folder `%s': %s"
+msgstr "Cannot subscribe to folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Cannot rename folder: %s: Invalid operation"
+msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 
 #: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Cannot create folder `%s': %s"
+msgstr "Cannot unsubscribe from folder `%s': Bad command"
 
 #: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Unexpected 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 ""
+msgstr "No data"
 
 #: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Server 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
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3201
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3204
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
@@ -10356,13 +10381,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10372,14 +10390,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "No such message"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/imap/camel-imap-folder.c:2622
 #: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
@@ -10389,7 +10407,24 @@ msgstr "This message is not currently available"
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr "Incomplete server response: no information provided for message %d"
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr "Incomplete server response: no UID provided for message %d"
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
@@ -10447,43 +10482,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:712
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:849
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1275
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1285
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1308
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1322
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1351
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10494,18 +10529,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1872
+#: camel/providers/imap/camel-imap-store.c:2062
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1948
+#: camel/providers/imap/camel-imap-store.c:2329
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:2003
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10513,7 +10548,7 @@ msgstr "The parent folder is not allowed to contain subfolders"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2279
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
@@ -10695,8 +10730,25 @@ msgstr "Maildir append message cancelled"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Cannot append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Invalid message contents"
 
@@ -10786,24 +10838,14 @@ msgstr "Mail append cancelled"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Cannot append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "The folder appears to be irrecoverably corrupted."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
+msgstr "Message construction failed."
 
 #: camel/providers/local/camel-mbox-store.c:176
 #: camel/providers/local/camel-mbox-store.c:362
@@ -11320,7 +11362,7 @@ msgstr "Delete after %s day(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Disable support for all POP3 extensions"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11409,7 +11451,7 @@ msgid "No such folder `%s'."
 msgstr "No such folder `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11463,7 +11505,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail delivery via the sendmail program"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11792,19 +11834,17 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
 #: composer/e-msg-composer.c:704
-#, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"Cannot sign outgoing message: No signing certificate set for from account"
+"Cannot sign outgoing message: No signing certificate set for this account"
 
 #: composer/e-msg-composer.c:711
-#, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
+"Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
 #: composer/e-msg-composer.c:1283
@@ -11823,7 +11863,7 @@ msgstr "Untitled Message"
 msgid "Open file"
 msgstr "Open file"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
@@ -12247,12 +12287,16 @@ msgstr "Sync Categories:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12304,23 +12348,31 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12417,6 +12469,7 @@ msgid "Missing file name."
 msgstr "Missing file name."
 
 #. filter:no-file secondary
+#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "You must specify a file name."
@@ -12447,6 +12500,7 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Could not compile regular expression \"{1}\"."
 
 #. filter:no-name primary
+#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Missing name."
@@ -12476,16 +12530,16 @@ msgstr "Please choose another name."
 msgid "No sources selected."
 msgstr "No sources selected."
 
-#. filter:vfolder-no-source secondary
 #: filter/filter-errors.xml.h:36
-#, fuzzy
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
 "all local folders, all remote folders, or both."
 msgstr ""
-"You must specify at least one folder as a source. You may select folders "
-"individually, or select all local and/or remote folders."
+"You must specify at least one folder as a source.\n"
+"Select folders individually, select all local folders,\n"
+"select all remote folders, or select all remote and\n"
+"local folders."
 
 #: filter/filter-file.c:288
 msgid "Choose a file"
@@ -12497,11 +12551,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12557,7 +12611,7 @@ msgstr "ago"
 msgid "months"
 msgstr "months"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "seconds"
 
@@ -12589,20 +12643,20 @@ msgstr "with all local folders"
 msgid "years"
 msgstr "years"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Later"
 
@@ -12631,24 +12685,20 @@ msgid "Execute actions"
 msgstr "Execute actions"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "All related"
-msgstr "Delegated"
+msgstr "All related"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "Replies"
-msgstr "Recipients"
+msgstr "Replies"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "Replies and parents"
-msgstr "Replies to %s"
+msgstr "Replies and parents"
 
 #: filter/filter-rule.c:879
-#, fuzzy
 msgid "Include threads"
-msgstr "Include:"
+msgstr "Include threads"
 
 #: filter/filter-rule.c:974
 msgid "incoming"
@@ -12957,9 +13007,8 @@ msgid "Virtual _Folders"
 msgstr "Virtual _Folders"
 
 #: filter/vfolder-rule.c:493
-#, fuzzy
 msgid "_Add"
-msgstr "A_dd"
+msgstr "_Add"
 
 #: filter/vfolder-rule.c:573
 msgid "VFolder source"
@@ -13044,15 +13093,14 @@ msgid "Create New Folder"
 msgstr "Create New Folder"
 
 #: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/mail-component.c:706
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
 #: mail/em-folder-selector.c:299
-#, fuzzy
 msgid "Create"
-msgstr "Create folder"
+msgstr "Create"
 
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
@@ -13069,12 +13117,12 @@ msgstr "Moving folder %s"
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:848 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:850 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
@@ -13092,15 +13140,14 @@ msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
 #: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Move"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
-#, fuzzy
+#: mail/em-folder-tree.c:961 mail/message-list.c:1653
 msgid "Cancel _Drag"
-msgstr "Cancel Task"
+msgstr "Cancel _Drag"
 
 #: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
@@ -13109,53 +13156,52 @@ msgid "Select folder"
 msgstr "Select folder"
 
 #: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
-#, fuzzy
 msgid "C_opy"
-msgstr "Copy"
+msgstr "C_opy"
 
 #: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2477
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2479
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2551
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2560
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2563
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13175,13 +13221,13 @@ msgstr "Loading..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
+#: mail/mail-component.c:556
 msgid "Mail"
 msgstr "Mail"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
@@ -13194,17 +13240,17 @@ msgstr "_Print"
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
@@ -13306,12 +13352,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Print Message"
 
@@ -13355,7 +13401,7 @@ msgstr "Bcc"
 msgid "Date"
 msgstr "Date"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
@@ -13406,9 +13452,8 @@ msgid "Invalid signature"
 msgstr "Invalid signature"
 
 #: mail/em-format-html.c:562
-#, fuzzy
 msgid "Valid signature but cannot verify sender"
-msgstr "Valid signature, cannot verify sender"
+msgstr "Valid signature but cannot verify sender"
 
 #: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
@@ -13606,7 +13651,7 @@ msgstr "Once per week"
 msgid "Once per month"
 msgstr "Once per month"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13618,84 +13663,84 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: mail/em-migrate.c:1506
-#, fuzzy, c-format
+#: mail/em-migrate.c:1602
+#, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "Cannot create folder `%s': %s"
+msgstr "Unable to create new folder `%s': %s"
 
-#: mail/em-migrate.c:1532
-#, fuzzy, c-format
+#: mail/em-migrate.c:1628
+#, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Could not rename folder %s to %s: %s"
+msgstr "Unable to copy folder `%s' to `%s': %s"
 
-#: mail/em-migrate.c:1715
-#, fuzzy, c-format
+#: mail/em-migrate.c:1811
+#, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Unable to save grouplist file for %s: %s"
+msgstr "Unable to scan for existing mailboxes at `%s': %s"
 
-#: mail/em-migrate.c:1919
-#, fuzzy, c-format
+#: mail/em-migrate.c:2015
+#, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Failed to authenticate on POP server %s: %s"
+msgstr "Unable to open old POP keep-on-server data `%s': %s"
 
-#: mail/em-migrate.c:1933
-#, fuzzy, c-format
+#: mail/em-migrate.c:2029
+#, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Failed to create directory `%s': %s"
+msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
+msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
-#, fuzzy, c-format
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Failed to create directory `%s': %s"
+msgstr "Failed to create local mail storage `%s': %s"
 
-#: mail/em-migrate.c:2480
-#, fuzzy, c-format
+#: mail/em-migrate.c:2576
+#, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
-"Unable to create output file: %s\n"
-" %s"
+msgstr "Unable to create local mail folders at `%s': %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Save As..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Se_nd message to..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
@@ -13870,9 +13915,8 @@ msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-#, fuzzy
 msgid "List of accepted licenses"
-msgstr "List of accounts"
+msgstr "List of accepted licences"
 
 #: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accounts"
@@ -13904,7 +13948,7 @@ msgstr "List of mime types to check for bonobo component viewers"
 
 #: mail/evolution-mail.schemas.in.in.h:36
 msgid "List of protocol names whose license has been accepted."
-msgstr ""
+msgstr "List of protocol names whose licence has been accepted."
 
 #: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
@@ -14220,7 +14264,7 @@ msgstr "spamd port"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "*Control*F1"
-msgstr ""
+msgstr "*Control*F1"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
@@ -14268,14 +14312,13 @@ msgstr "Evolution Mail preferences control"
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
 msgid "_Mail"
-msgstr "Mail"
+msgstr "_Mail"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14482,21 +14525,25 @@ msgid ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 msgstr ""
+"\n"
+"Please read carefully the licence agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
 
 #: mail/mail-account-gui.c:252
-#, fuzzy, c-format
+#, c-format
 msgid "%s License Agreement"
-msgstr "Key Agreement"
+msgstr "%s Licence Agreement"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "User_name:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Path:"
 
@@ -14524,68 +14571,68 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:465
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:496
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:498
 #, c-format
 msgid ", %d unread"
 msgstr ", %d unread"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:658
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:659
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:660
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:666
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:667
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:668
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:800
 msgid "Failed upgrading Mail settings or folders."
-msgstr ""
+msgstr "Failed upgrading Mail settings or folders."
 
 #: mail/mail-config.c:895
 msgid "Checking Service"
@@ -14595,7 +14642,7 @@ msgstr "Checking Service"
 msgid "Connecting to server..."
 msgstr "Connecting to server..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identity"
 
@@ -14610,7 +14657,7 @@ msgstr ""
 "information in email you send."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Receiving Mail"
 
@@ -14626,7 +14673,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Please select among the following options"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
@@ -14638,7 +14685,7 @@ 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:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Account Management"
 
@@ -14656,227 +14703,231 @@ msgstr ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Ch_eck for Supported Types "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Preview</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL is not supported in this build of evolution</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>S_ignatures</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Languages</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr "<small>This will make the the filter more reliable, but slower</small>"
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Account Information</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alerts</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Authentication Type</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Authentication</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Checking for New Mail</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Composing Messages</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuration</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Default Behaviour</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Delete Mail</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filter Options</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Labels and Colours</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Loading Images</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Message Display</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Message Fonts</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">New Mail Notification</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Optional Information</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Options</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Printed Fonts</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Required Information</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Security</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Server Configuration</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "A_lso encrypt to self when sending encrypted mail"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signature..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Al_ways encrypt to myself when sending encrypted mail"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alway_s carbon-copy (cc) to:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Always _sign outgoing messages when using this account"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Attach original message"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Attachment"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "Automatically _insert smiley images"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "Automatically check for _new mail every"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "Beep w_hen new mail arrives"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "C_haracter set:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "Ch_eck for Supported Types "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
+msgstr "Check _incoming mail for junk"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Checks incoming mail messages to be Junk"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelled words:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14892,107 +14943,111 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "De_fault"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Defaults"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Do not quote original message"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Don't sign _meeting requests (for Outlook compatibility)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Done"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Drafts _Folder:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Email Accounts"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Email _Address:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Empty trash folders on e_xit"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "Fi_xed-width:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Font Properties"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML Mail"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Headers"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr "I_nclude remote tests"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Message Composer"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15000,131 +15055,131 @@ msgstr ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganization:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "Play sound file when new mail arri_ves"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Quote original message"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Quoted"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Receiving Email"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Security"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Select HTML fixed width font for printing"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Select..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Sending Email"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Si_gning certificate:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Signatures"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Specify _filename:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "T_erminal Font:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "T_ype: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15134,7 +15189,7 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15144,7 +15199,7 @@ msgstr ""
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15152,15 +15207,11 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Use _Daemon"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15170,87 +15221,83 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Digitally sign outgoing messages (by default)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Do not notify me when new mail arrives"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Enable"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Encrypt outgoing messages (by default)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Load images if sender is in address book"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "_Local Tests Only"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Prompt when sending HTML messages to contacts that don't want them"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prompt when sending messages with an empty subject line"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Use Secure Connection (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "colour"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "description"
 
@@ -15275,12 +15322,11 @@ msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
-#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"Check to make sure your password is spelled correctly. Remember that many "
+"Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 
 #. mail:ask-send-html primary
@@ -15288,9 +15334,7 @@ msgstr ""
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
-#. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
-#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15298,7 +15342,9 @@ msgid ""
 "Send anyway?"
 msgstr ""
 "Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
@@ -15320,13 +15366,12 @@ msgstr ""
 "an idea of the topic of your letter."
 
 #. mail:ask-send-only-bcc-contact primary
+#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
-#. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
-#, fuzzy
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15335,11 +15380,12 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"The contact list you are sending to is configured to hide list recipients. "
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients in "
 "your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"recipient. "
 
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
@@ -15377,12 +15423,11 @@ msgstr "Use default drafts folder?"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
-#, fuzzy
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr ""
-"Unable to open the drafts folder for this account. Use the system drafts "
+"Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 
 #: mail/mail-errors.xml.h:41
@@ -15399,6 +15444,7 @@ msgstr ""
 "folder \"{0}\"?"
 
 #. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
@@ -15439,18 +15485,17 @@ msgstr ""
 msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr "Your message message, with the subject \"{0}\" was not delivered."
 
-#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
-#, fuzzy
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
 "The message is stored in the Outbox folder.  Check the message for errors "
 "and resend."
 msgstr ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
 
 #. mail:async-error primary
 #: mail/mail-errors.xml.h:62
@@ -15473,6 +15518,13 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15501,6 +15553,8 @@ msgid "{1}"
 msgstr "{1}"
 
 #. mail:no-create-path primary
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15517,6 +15571,9 @@ msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
 #. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
 #: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
 #: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
@@ -15543,6 +15600,7 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
+#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15576,11 +15634,13 @@ msgstr ""
 "will be deleted permanently."
 
 #. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "A folder named \"{1}\" already exists. Please use a different name."
@@ -15591,21 +15651,25 @@ msgid "Because \"{2}\"."
 msgstr "Because \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15621,6 +15685,7 @@ msgid "Cannot open source \"{1}\""
 msgstr "Cannot open source \"{1}\""
 
 #. mail:account-incomplete primary
+#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
@@ -15717,9 +15782,7 @@ msgstr "Cannot add vFolder \"{0}\"."
 msgid "vFolders automatically updated."
 msgstr "vFolders automatically updated."
 
-#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
-#, fuzzy
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -15727,17 +15790,18 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 
 #. mail:filter-updated primary
 #: mail/mail-errors.xml.h:202
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15745,15 +15809,17 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 
 #. mail:ask-migrate-existing primary
 #: mail/mail-errors.xml.h:210
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr ""
+msgstr "Problem migrating old mail folder \"{0}\"."
 
-#. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:212
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
@@ -15761,44 +15827,42 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 msgstr ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 
 #: mail/mail-errors.xml.h:216
 msgid "Ignore"
-msgstr ""
+msgstr "Ignore"
 
 #: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
-#, fuzzy
 msgid "_Overwrite"
-msgstr "Overwrite"
+msgstr "_Overwrite"
 
 #: mail/mail-errors.xml.h:218
-#, fuzzy
 msgid "_Append"
-msgstr "_Send"
+msgstr "_Append"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:791
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Working"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtering Folder"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15807,115 +15871,115 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d message(s)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messsage(s)"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15924,7 +15988,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15933,11 +15997,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15946,17 +16010,17 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
@@ -16020,24 +16084,24 @@ msgstr "Updating..."
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "User canceled operation."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
@@ -16083,88 +16147,88 @@ msgid "Setting up vfolder: %s"
 msgstr "Setting up vfolder: %s"
 
 #: mail/mail-vfolder.c:235
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s:%s'"
-msgstr "Updating vfolders for uri: %s"
+msgstr "Updating vFolders for '%s:%s'"
 
 #: mail/mail-vfolder.c:242
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s'"
-msgstr "Updating vfolders for uri: %s"
+msgstr "Updating vFolders for '%s'"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Unseen"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Seen"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Answered"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Lowest"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Lower"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Higher"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Highest"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -16339,28 +16403,27 @@ msgid "Brought to you by"
 msgstr "Brought to you by"
 
 #: shell/e-shell.c:545 shell/e-shell.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "%ld KB"
-msgstr "%d %B"
+msgstr "%ld KB"
 
-#: shell/e-shell.c:744
-#, fuzzy
+#: shell/e-shell.c:743
 msgid "Uknown system error."
-msgstr "Unknown error"
+msgstr "Uknown system error."
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1100
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1102
 msgid "Cannot register on OAF"
 msgstr "Cannot register on OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1104
 msgid "Configuration Database not found"
 msgstr "Configuration Database not found"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1106
 msgid "Generic error"
 msgstr "Generic error"
 
@@ -16548,26 +16611,21 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
 #: shell/e-shell-window.c:336
-#, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution is currently online.  Click on this button to work offline."
 
 #: shell/e-shell-window.c:343
-#, fuzzy
 msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution is in the process of going offline."
+msgstr "Evolution is in the process of going offline."
 
 #: shell/e-shell-window.c:349
-#, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution is currently offline.  Click on this button to work online."
 
 #: shell/e-shell-window.c:621
-#, fuzzy, c-format
+#, c-format
 msgid "Switch to %s"
-msgstr "Mail to %s"
+msgstr "Switch to %s"
 
 #: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
@@ -16587,9 +16645,8 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy could not be run."
 
 #: shell/e-shell-window-commands.c:171
-#, fuzzy
 msgid "About Evolution"
-msgstr "About Ximian Evolution"
+msgstr "About Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
@@ -16611,43 +16668,6 @@ msgstr "Checkbox"
 msgid "New"
 msgstr "New"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unknown error."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "New Test"
@@ -16673,49 +16693,40 @@ msgid "Click OK to close these connections and go offline"
 msgstr "Click OK to close these connections and go offline"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
-#, fuzzy
 msgid "C_alendar:"
-msgstr "C_alendar"
+msgstr "C_alendar:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
 msgid "_Contacts:"
-msgstr "Contacts: "
+msgstr "_Contacts:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
 msgid "_Mail:"
-msgstr "Mail"
+msgstr "_Mail:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:4
-#, fuzzy
 msgid "_Tasks:"
-msgstr "_Tasks"
+msgstr "_Tasks:"
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
 msgid "Folder _type:"
-msgstr "File _type:"
+msgstr "Folder _type:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
 msgid "Open Other User's Folder"
-msgstr "Sent _Messages Folder:"
+msgstr "Open Other User's Folder"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
 msgid "_Account:"
-msgstr "_Account name:"
+msgstr "_Account:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
 msgid "_Folder Name:"
-msgstr "Folder Name"
+msgstr "_Folder Name:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
 msgid "_User:"
-msgstr "User_name:"
+msgstr "_User:"
 
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
@@ -16829,9 +16840,8 @@ msgstr "Don't ask me again"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
-#. Preview/Alpha/Beta version warning message
 #: shell/main.c:231
-#, fuzzy, no-c-format
+#, c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -16850,9 +16860,9 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
 "but some features are either unfinished or do not work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -16866,13 +16876,12 @@ msgstr ""
 "eagerly await your contributions!\n"
 
 #: shell/main.c:255
-#, fuzzy
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 
 #: shell/main.c:262
 msgid "Don't tell me again"
@@ -16918,9 +16927,8 @@ msgstr ""
 #. shell:upgrade-nospace primary
 #: shell/shell-errors.xml.h:2
 msgid "Insufficient disk space for upgrade."
-msgstr ""
+msgstr "Insufficient disk space for upgrade."
 
-#. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
@@ -16929,15 +16937,20 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
+"Upgrading your data and settings will require up to {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
 
-#. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
 msgstr ""
+"Upgrade from previous version failed:\n"
+"{0}"
 
-#. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
@@ -16945,33 +16958,37 @@ msgid ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 
 #: shell/shell-errors.xml.h:15
-#, fuzzy
 msgid "Continue"
-msgstr "Connecting"
+msgstr "Continue"
 
 #. shell:noshell title
+#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
-#, fuzzy
 msgid "Cannot start Evolution"
-msgstr "Cannot register the Ximian Evolution shell."
+msgstr "Cannot start Evolution"
 
 #. shell:noshell primary
+#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
-#, fuzzy
 msgid "Evolution can not start."
-msgstr "Evolution Account Assistant"
+msgstr "Evolution cannot start."
 
-#. shell:noshell secondary
 #: shell/shell-errors.xml.h:21
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
 
-#. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:29
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
@@ -16980,6 +16997,11 @@ msgid ""
 "\n"
 "Click help for details."
 msgstr ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
 
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
@@ -17046,6 +17068,10 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+msgid "Select certificate"
+msgstr "Select certificate"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Not Part of Certificate>"
@@ -17408,7 +17434,7 @@ 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
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
@@ -17520,9 +17546,8 @@ msgid "Select all contacts"
 msgstr "Select all contacts"
 
 #: ui/evolution-addressbook.xml.h:23
-#, fuzzy
 msgid "Send a message to the selected contacts."
-msgstr "Send a mess to the selected contacts."
+msgstr "Send a message to the selected contacts."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
@@ -17571,9 +17596,8 @@ msgid "_Preview Pane"
 msgstr "_Preview Pane"
 
 #: ui/evolution-addressbook.xml.h:41
-#, fuzzy
 msgid "_Save as VCard..."
-msgstr "_Save as VCard"
+msgstr "_Save as VCard..."
 
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -18275,9 +18299,8 @@ msgid "Open the selected message in a new window"
 msgstr "Open the selected message in a new window"
 
 #: ui/evolution-mail-message.xml.h:71
-#, fuzzy
 msgid "Open the selected message in the composer for editing"
-msgstr "Open the selected message in the composer to re-send it"
+msgstr "Open the selected message in the composer for editing"
 
 #: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
@@ -18828,9 +18851,8 @@ msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
 #: ui/evolution.xml.h:36
-#, fuzzy
 msgid "_Window"
-msgstr "New _Window"
+msgstr "_Window"
 
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -18897,7 +18919,7 @@ msgid "With _Status"
 msgstr "With _Status"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19051,34 +19073,31 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
-#, fuzzy
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
-msgstr "Evolution"
+msgstr "Evolution Error"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
-#, fuzzy
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
-msgstr "Evolution Mail"
+msgstr "Evolution Warning"
 
-#: widgets/misc/e-error.c:118
-#, fuzzy
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
-msgstr "Meeting Information"
+msgstr "Evolution Information"
 
-#: widgets/misc/e-error.c:120
-#, fuzzy
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
-msgstr "Evolution Test"
+msgstr "Evolution Query"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
-#, fuzzy, c-format
+#: widgets/misc/e-error.c:415
+#, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -19196,38 +19215,88 @@ msgstr "Find _Now"
 #. system:ask-save-file-exists-overwrite primary
 #: widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
-msgstr ""
+msgstr "File exists \"{0}\"."
 
 #. system:ask-save-file-exists-overwrite secondary
 #: widgets/misc/e-system-errors.xml.h:6
-#, fuzzy
 msgid "Do you wish to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
+msgstr "Do you wish to overwrite it?"
 
 #. system:no-save-file primary
 #: widgets/misc/e-system-errors.xml.h:9
-#, fuzzy
 msgid "Cannot save file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
+msgstr "Cannot save file \"{0}\"."
 
 #. system:no-load-file primary
 #: widgets/misc/e-system-errors.xml.h:13
-#, fuzzy
 msgid "Cannot open file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
+msgstr "Cannot open file \"{0}\"."
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Job title:"
+#~ msgstr "Job title:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Could not find widget for a field: `%s'"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Can not load URI"
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Learning junk and/or non junk message(s)"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Check _Incoming Mail"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Use _Daemon"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "_Local Tests Only"
+
+#~ msgid "Working"
+#~ msgstr "Working"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution Addressbook folder viewer"