Updated Canadian English translation.

	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=27369

1 files changed, 279 insertions, 289 deletions

diff --git a/po/en_CA.po b/po/en_CA.po
index 84a573645b..c30dc10599 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-23 12:41-0400\n"
-"PO-Revision-Date: 2004-09-23 19:18-0400\n"
+"POT-Creation-Date: 2004-09-24 12:48-0400\n"
+"PO-Revision-Date: 2004-09-24 19:18-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -219,17 +219,35 @@ msgid ""
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
+#. addressbook:ask-list-add-exists primary
+#: addressbook/addressbook-errors.xml.h:55
+msgid "Address '{0}' already exists."
+msgstr "Address '{0}' already exists."
+
+#. addressbook:ask-list-add-exists secondary
+#: addressbook/addressbook-errors.xml.h:57
+msgid ""
+"A contact already exists with this address.  Would you like to add a new "
+"card with the same address anyway?"
+msgstr ""
+"A contact with this address already exists.  Would you like to add a new "
+"card with the same address anyway?"
+
+#: addressbook/addressbook-errors.xml.h:58 mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Add"
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: addressbook/conduit/address-conduit.c:1181
-#: addressbook/conduit/address-conduit.c:1182
+#: addressbook/conduit/address-conduit.c:1183
+#: addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Could not load addressbook"
 
-#: addressbook/conduit/address-conduit.c:1250
-#: addressbook/conduit/address-conduit.c:1253
+#: addressbook/conduit/address-conduit.c:1252
+#: addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
@@ -345,7 +363,7 @@ msgstr "Migrating `%s':"
 #: addressbook/gui/component/addressbook-migrate.c:493
 #: calendar/gui/migration.c:450 calendar/gui/migration.c:532
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:251 mail/mail-vfolder.c:218
+#: mail/mail-component.c:252 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -496,11 +514,11 @@ msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 msgid "URI for the folder last used in the select names dialog"
-msgstr "URI for the folder last used in the select names dialog"
+msgstr "URI for the folder last used in the select names dialogue"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "URI for the folder last used in the select names dialog."
-msgstr "URI for the folder last used in the select names dialog."
+msgstr "URI for the folder last used in the select names dialogue."
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
@@ -2926,10 +2944,9 @@ msgstr "Protocol not supported"
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-cal-model-tasks.c:353 calendar/gui/e-cal-model-tasks.c:656
 #: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:724 camel/camel-service.c:762
-#: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:457
-#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/camel-service.c:723 camel/camel-service.c:887
+#: camel/camel-service.c:1015 camel/providers/pop3/camel-pop3-store.c:464
+#: camel/providers/pop3/camel-pop3-store.c:545
 msgid "Cancelled"
 msgstr "Canceled"
 
@@ -3493,12 +3510,12 @@ msgid "In async mode, output must be file."
 msgstr "In async mode, output must be file."
 
 #: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr "In normal mode, there should not need size option."
+msgid "In normal mode, there is no need for the size option."
+msgstr "In normal mode, there is no need for the size option."
 
 #: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr "Impossible internal error."
+msgid "Unhandled error"
+msgstr "Unhandled error"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3958,7 +3975,7 @@ msgstr ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
+"a normal reminder dialogue box instead."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:1111
 #, c-format
@@ -5468,7 +5485,7 @@ msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:949
 #: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1012
 msgid "Normal"
 msgstr "Normal"
@@ -5723,11 +5740,11 @@ msgstr "Start Date"
 msgid "Summary"
 msgstr "Summary"
 
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-calendar.c:181 calendar/gui/e-calendar-table.c:449
 msgid "Free"
 msgstr "Free"
 
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-cal-model-calendar.c:184 calendar/gui/e-calendar-table.c:450
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Busy"
@@ -5758,13 +5775,13 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:949
+#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955
 #: calendar/gui/e-meeting-list-view.c:146 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-tasks.c:1013 calendar/gui/e-cal-model.c:949
+#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955
 #: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
@@ -5790,11 +5807,11 @@ msgstr "No"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: calendar/gui/e-cal-model.c:945
+#: calendar/gui/e-cal-model.c:951
 msgid "Recurring"
 msgstr "Recurring"
 
-#: calendar/gui/e-cal-model.c:947
+#: calendar/gui/e-cal-model.c:953
 msgid "Assigned"
 msgstr "Assigned"
 
@@ -5919,7 +5936,7 @@ msgstr "_Mark Selected Tasks as Complete"
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
 #: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2728 mail/em-folder-view.c:946
+#: mail/em-folder-tree.c:2740 mail/em-folder-view.c:946
 #: 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
@@ -6195,7 +6212,6 @@ msgstr "iCalendar Error"
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:1096
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -7144,7 +7160,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:423 mail/mail-component.c:522
+#: calendar/gui/tasks-component.c:423 mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -9086,8 +9102,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
 #: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1234
-#: camel/providers/nntp/camel-nntp-store.c:1332 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1244
+#: camel/providers/nntp/camel-nntp-store.c:1342 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:612
 msgid "Cancelled."
 msgstr "Canceled."
@@ -9380,15 +9396,15 @@ msgstr "Server challenge invalid\n"
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Server challenge contained invalid \"Quality of Protection\" token\n"
 
-#: camel/camel-sasl-digest-md5.c:851
+#: camel/camel-sasl-digest-md5.c:859
 msgid "Server response did not contain authorization data\n"
 msgstr "Server response did not contain authorization data\n"
 
-#: camel/camel-sasl-digest-md5.c:869
+#: camel/camel-sasl-digest-md5.c:877
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Server response contained incomplete authorization data\n"
 
-#: camel/camel-sasl-digest-md5.c:879
+#: camel/camel-sasl-digest-md5.c:887
 msgid "Server response does not match\n"
 msgstr "Server response does not match\n"
 
@@ -9463,16 +9479,11 @@ msgstr "The referenced credentials have expired."
 
 #: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
 #: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
-#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1234
+#: camel/camel-sasl-kerberos4.c:225
+#: camel/providers/imap/camel-imap-store.c:1243
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: camel/camel-sasl-gssapi.c:217
-#, c-format
-msgid "Failed to resolve host `%s': %s"
-msgstr "Failed to resolve host `%s': %s"
-
 #: camel/camel-sasl-gssapi.c:303
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
@@ -9486,7 +9497,7 @@ msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "This option will connect to the server using Kerberos 4 authentication."
 
-#: camel/camel-sasl-kerberos4.c:162
+#: camel/camel-sasl-kerberos4.c:168
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -9548,57 +9559,41 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: camel/camel-service.c:271
+#: camel/camel-service.c:273
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' needs a username component"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' needs a host component"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' needs a path component"
 
-#: camel/camel-service.c:729
+#: camel/camel-service.c:742
+msgid "cannot create thread"
+msgstr "cannot create thread"
+
+#: camel/camel-service.c:891
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
-#: camel/camel-service.c:760 camel/camel-service.c:884
-#, c-format
-msgid "Failure in name lookup: %s"
-msgstr "Failure in name lookup: %s"
-
-#: camel/camel-service.c:781 camel/camel-service.c:905
-#, c-format
-msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Host lookup failed: cannot create thread: %s"
-
-#: camel/camel-service.c:794
-#, c-format
-msgid "Host lookup failed: %s: host not found"
-msgstr "Host lookup failed: %s: host not found"
-
-#: camel/camel-service.c:797
-#, c-format
-msgid "Host lookup failed: %s: unknown reason"
-msgstr "Host lookup failed: %s: unknown reason"
+#: camel/camel-service.c:912
+msgid "Host lookup failed"
+msgstr "Host lookup failed"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:1019
 msgid "Resolving address"
 msgstr "Resolving address"
 
-#: camel/camel-service.c:920
-msgid "Host lookup failed: host not found"
-msgstr "Host lookup failed: host not found"
-
-#: camel/camel-service.c:923
-msgid "Host lookup failed: unknown reason"
-msgstr "Host lookup failed: unknown reason"
+#: camel/camel-service.c:1039
+msgid "Name lookup failed"
+msgstr "Name lookup failed"
 
 #: camel/camel-session.c:283
 #, c-format
@@ -10180,12 +10175,12 @@ msgstr "Checklist"
 #: 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:3218
+#: camel/providers/imap/camel-imap-store.c:3227
 msgid "Operation cancelled"
 msgstr "Operation canceled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3221
+#: camel/providers/imap/camel-imap-store.c:3230
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
@@ -10193,9 +10188,9 @@ msgstr "Server unexpectedly disconnected: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/imap4/camel-imap4-store.c:283
-#: camel/providers/pop3/camel-pop3-store.c:544
 #: camel/providers/pop3/camel-pop3-store.c:551
-#: camel/providers/pop3/camel-pop3-store.c:557 shell/e-shell.c:1230
+#: camel/providers/pop3/camel-pop3-store.c:558
+#: camel/providers/pop3/camel-pop3-store.c:564 shell/e-shell.c:1230
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -10384,80 +10379,77 @@ msgstr "IMAP server %s"
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imap4/camel-imap4-store.c:214
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imapp/camel-imapp-store.c:232
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:176
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
+#: camel/providers/imap/camel-imap-store.c:550
+#: camel/providers/imap/camel-imap-store.c:574
+#: camel/providers/nntp/camel-nntp-store.c:219
+#: camel/providers/pop3/camel-pop3-store.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Could not connect to %s (port %d): %s"
+msgid "Could not connect to %s (port %s): %s"
+msgstr "Could not connect to %s (port %s): %s"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:552
 #: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/pop3/camel-pop3-store.c:178
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:273
 msgid "SSL unavailable"
 msgstr "SSL unavailable"
 
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:839
+#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:848
 #: camel/providers/imap4/camel-imap4-store.c:227
 #: camel/providers/imapp/camel-imapp-store.c:229
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:193
+#: camel/providers/nntp/camel-nntp-store.c:216
+#: camel/providers/nntp/camel-nntp-store.c:234
+#: camel/providers/pop3/camel-pop3-store.c:200
 msgid "Connection cancelled"
 msgstr "Connection canceled"
 
-#: camel/providers/imap/camel-imap-store.c:673
-#: camel/providers/imap/camel-imap-store.c:704
+#: camel/providers/imap/camel-imap-store.c:682
+#: camel/providers/imap/camel-imap-store.c:713
 #: camel/providers/imap4/camel-imap4-store.c:282
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Failed to connect to IMAP server %s in secure mode: %s"
 
-#: camel/providers/imap/camel-imap-store.c:674
-#: camel/providers/pop3/camel-pop3-store.c:234
+#: camel/providers/imap/camel-imap-store.c:683
+#: camel/providers/pop3/camel-pop3-store.c:241
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:705
-#: camel/providers/pop3/camel-pop3-store.c:275
+#: camel/providers/imap/camel-imap-store.c:714
+#: camel/providers/pop3/camel-pop3-store.c:282
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:842
+#: camel/providers/imap/camel-imap-store.c:851
 #, 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:1266
+#: 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:1276
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1285
+#: camel/providers/smtp/camel-smtp-transport.c:493
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1299
+#: camel/providers/imap/camel-imap-store.c:1308
 #: camel/providers/imapp/camel-imapp-store.c:345
 #, 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:1313
+#: 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:1342
+#: camel/providers/imap/camel-imap-store.c:1351
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10468,14 +10460,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1861
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1870
+#: camel/providers/imap/camel-imap-store.c:2060
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1879
-#: camel/providers/imap/camel-imap-store.c:2257
+#: camel/providers/imap/camel-imap-store.c:1888
+#: camel/providers/imap/camel-imap-store.c:2266
 #: camel/providers/imap4/camel-imap4-store.c:764
 #, c-format
 msgid ""
@@ -10483,12 +10475,12 @@ msgid ""
 msgstr ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1937
-#: camel/providers/imap/camel-imap-store.c:2318
+#: camel/providers/imap/camel-imap-store.c:1946
+#: camel/providers/imap/camel-imap-store.c:2327
 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:1992
+#: camel/providers/imap/camel-imap-store.c:2001
 #: camel/providers/local/camel-maildir-store.c:140
 #: camel/providers/local/camel-mbox-store.c:213
 #: camel/providers/local/camel-mh-store.c:237
@@ -10496,7 +10488,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:2268
+#: camel/providers/imap/camel-imap-store.c:2277
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
@@ -10609,6 +10601,13 @@ msgid ""
 msgstr ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 
+#: camel/providers/imap4/camel-imap4-store.c:214
+#: camel/providers/imap4/camel-imap4-store.c:230
+#: camel/providers/imapp/camel-imapp-store.c:232
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Could not connect to %s (port %d): %s"
+
 #: camel/providers/imap4/camel-imap4-store.c:257
 #, c-format
 msgid ""
@@ -10892,10 +10891,12 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr "Unable to add message to summary: unknown reason"
 
 #. Inbox is always first
+#. translators: standard local mailbox names
 #: camel/providers/local/camel-maildir-folder.c:75
 #: camel/providers/local/camel-maildir-store.c:233
 #: camel/providers/local/camel-maildir-store.c:249
 #: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: mail/mail-component.c:136
 msgid "Inbox"
 msgstr "Inbox"
 
@@ -11270,7 +11271,7 @@ msgstr ""
 "Folder may be corrupt, copy saved in `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1126
+#: camel/providers/nntp/camel-nntp-store.c:1136
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Please enter the NNTP password for %s@%s"
@@ -11354,7 +11355,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
-msgstr "In the subscription dialog, show relative folder names"
+msgstr "In the subscription dialogue, show relative folder names"
 
 #: camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
@@ -11373,28 +11374,28 @@ msgstr ""
 "password."
 
 #: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1236
-#: camel/providers/nntp/camel-nntp-store.c:1334
+#: camel/providers/nntp/camel-nntp-store.c:1246
+#: camel/providers/nntp/camel-nntp-store.c:1344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP Command failed: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:227
+#: camel/providers/nntp/camel-nntp-store.c:237
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Could not read greeting from %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:239
+#: camel/providers/nntp/camel-nntp-store.c:249
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s returned error code %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:403
+#: camel/providers/nntp/camel-nntp-store.c:413
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:777
+#: camel/providers/nntp/camel-nntp-store.c:787
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11405,7 +11406,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:872
+#: camel/providers/nntp/camel-nntp-store.c:882
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11415,7 +11416,7 @@ msgstr ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 
-#: camel/providers/nntp/camel-nntp-store.c:904
+#: camel/providers/nntp/camel-nntp-store.c:914
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11425,32 +11426,32 @@ msgstr ""
 "\n"
 "newsgroup does not exist!"
 
-#: camel/providers/nntp/camel-nntp-store.c:929
+#: camel/providers/nntp/camel-nntp-store.c:939
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "You cannot create a folder in a News store: subscribe instead."
 
-#: camel/providers/nntp/camel-nntp-store.c:937
+#: camel/providers/nntp/camel-nntp-store.c:947
 msgid "You cannot rename a folder in a News store."
 msgstr "You cannot rename a folder in a News store."
 
-#: camel/providers/nntp/camel-nntp-store.c:945
+#: camel/providers/nntp/camel-nntp-store.c:955
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 
-#: camel/providers/nntp/camel-nntp-store.c:1118
+#: camel/providers/nntp/camel-nntp-store.c:1128
 msgid "Authentication requested but not username provided"
 msgstr "Authentication requested but no username provided"
 
-#: camel/providers/nntp/camel-nntp-store.c:1148
+#: camel/providers/nntp/camel-nntp-store.c:1158
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Cannot authenticate to server: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1265
+#: camel/providers/nntp/camel-nntp-store.c:1275
 msgid "Not connected."
 msgstr "Not connected."
 
-#: camel/providers/nntp/camel-nntp-store.c:1314
+#: camel/providers/nntp/camel-nntp-store.c:1324
 #, c-format
 msgid "No such folder: %s"
 msgstr "No such folder: %s"
@@ -11549,30 +11550,30 @@ msgstr ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 
-#: camel/providers/pop3/camel-pop3-store.c:196
+#: camel/providers/pop3/camel-pop3-store.c:203
 #, c-format
-msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "Could not connect to POP server %s (port %d): %s"
+msgid "Could not connect to POP server %s (port %s): %s"
+msgstr "Could not connect to POP server %s (port %s): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:222
 #, c-format
-msgid "Failed to read a valid greeting from POP server %s (port %d)"
-msgstr "Failed to read a valid greeting from POP server %s (port %d)"
+msgid "Failed to read a valid greeting from POP server %s (port %s)"
+msgstr "Failed to read a valid greeting from POP server %s (port %s)"
 
-#: camel/providers/pop3/camel-pop3-store.c:233
-#: camel/providers/pop3/camel-pop3-store.c:262
-#: camel/providers/pop3/camel-pop3-store.c:274
+#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/pop3/camel-pop3-store.c:281
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Failed to connect to POP server %s in secure mode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:372
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Could not connect to POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:527
+#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:534
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11581,28 +11582,28 @@ msgstr ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:429
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Login failed for POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:441
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Cannot login to POP server %s: SASL Protocol error"
 
-#: camel/providers/pop3/camel-pop3-store.c:460
+#: camel/providers/pop3/camel-pop3-store.c:467
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Failed to authenticate on POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:486
+#: camel/providers/pop3/camel-pop3-store.c:493
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPlease enter the POP password for %s on host %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
-#: camel/providers/pop3/camel-pop3-store.c:554
+#: camel/providers/pop3/camel-pop3-store.c:548
+#: camel/providers/pop3/camel-pop3-store.c:561
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11611,7 +11612,7 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:548
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11620,7 +11621,7 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:653
+#: camel/providers/pop3/camel-pop3-store.c:660
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No such folder `%s'."
@@ -11787,40 +11788,40 @@ msgstr "Temporary authentication failure"
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: camel/providers/smtp/camel-smtp-transport.c:308
+#: camel/providers/smtp/camel-smtp-transport.c:315
 msgid "Welcome response error"
 msgstr "Welcome response error"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:389
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Failed to connect to SMTP server %s in secure mode: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:351
 msgid "server does not appear to support SSL"
 msgstr "server does not appear to support SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:365
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:380
 msgid "STARTTLS command failed"
 msgstr "STARTTLS command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s does not support requested authentication type %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:521
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sPlease enter the SMTP password for %s on host %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:540
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -11831,93 +11832,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:657
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:659
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail delivery via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: service not connected."
 msgstr "Cannot send message: service not connected."
 
-#: camel/providers/smtp/camel-smtp-transport.c:683
+#: camel/providers/smtp/camel-smtp-transport.c:690
 msgid "Cannot send message: sender address not valid."
 msgstr "Cannot send message: sender address not valid."
 
-#: camel/providers/smtp/camel-smtp-transport.c:687
+#: camel/providers/smtp/camel-smtp-transport.c:694
 msgid "Sending message"
 msgstr "Sending message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:709
 msgid "Cannot send message: no recipients defined."
 msgstr "Cannot send message: no recipients defined."
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Cannot send message: one or more invalid recipients"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:889
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:906
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:923
 msgid "HELO command failed"
 msgstr "HELO command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:989
 msgid "SMTP Authentication"
 msgstr "SMTP Authentication"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:995
 msgid "Error creating SASL authentication object."
 msgstr "Error creating SASL authentication object."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1029
 msgid "AUTH command failed"
 msgstr "AUTH command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 msgid "Bad authentication response from server.\n"
 msgstr "Bad authentication response from server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1116
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1161
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1185
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1204
+#: camel/providers/smtp/camel-smtp-transport.c:1176
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
-#: camel/providers/smtp/camel-smtp-transport.c:1301
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1215
+#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1292
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA command failed: %s: mail not sent"
@@ -11925,26 +11926,26 @@ msgstr "DATA command failed: %s: mail not sent"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1260
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1308
 msgid "DATA command failed"
 msgstr "DATA command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1359
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1375
+#: camel/providers/smtp/camel-smtp-transport.c:1347
 msgid "RSET command failed"
 msgstr "RSET command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1370
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1412
+#: camel/providers/smtp/camel-smtp-transport.c:1384
 msgid "QUIT command failed"
 msgstr "QUIT command failed"
 
@@ -11967,7 +11968,7 @@ msgstr "%.0fG"
 msgid "attachment"
 msgstr "attachment"
 
-#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2732
+#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2744
 #: ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Properties"
@@ -12313,7 +12314,6 @@ msgstr "Could not create composer window."
 msgid "Unable to activate the address selector control."
 msgstr "Unable to activate the address selector control."
 
-#. mail-composer:no-editor-control secondary
 #: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -12877,8 +12877,8 @@ msgstr "Evolution Mail preferences control"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:420
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:530
-#: mail/mail-component.c:581
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
+#: mail/mail-component.c:582
 msgid "Mail"
 msgstr "Mail"
 
@@ -13186,8 +13186,8 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1546
-#: mail/em-format-quote.c:306 mail/em-format.c:825 mail/em-mailer-prefs.c:88
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1569
+#: mail/em-format-quote.c:306 mail/em-format.c:824 mail/em-mailer-prefs.c:88
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -13231,8 +13231,8 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2445
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2457
+#: mail/mail-component.c:732
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
@@ -13254,7 +13254,7 @@ msgstr "VFolders"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
 msgid "Loading..."
 msgstr "Loading..."
 
@@ -13290,7 +13290,7 @@ msgstr "_Copy to Folder"
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:1021 mail/em-folder-tree.c:2229
+#: mail/em-folder-tree.c:1021 mail/em-folder-tree.c:2241
 #: mail/em-folder-view.c:817 mail/message-list.c:1710
 msgid "_Move"
 msgstr "_Move"
@@ -13299,59 +13299,64 @@ msgstr "_Move"
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: mail/em-folder-tree.c:2215 mail/em-folder-tree.c:2229
+#: mail/em-folder-tree.c:1718 mail/mail-ops.c:1003
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Scanning folders in \"%s\""
+
+#: mail/em-folder-tree.c:2227 mail/em-folder-tree.c:2241
 #: mail/em-folder-view.c:817 mail/em-folder-view.c:832
 #: mail/importers/evolution-mbox-importer.c:120
 #: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2215 mail/em-folder-view.c:832
+#: mail/em-folder-tree.c:2227 mail/em-folder-view.c:832
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2256
+#: mail/em-folder-tree.c:2268
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2445 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2457 mail/mail-component.c:732
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2638
+#: mail/em-folder-tree.c:2650
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2640
+#: mail/em-folder-tree.c:2652
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2716 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2728 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:37
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2717
+#: mail/em-folder-tree.c:2729
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2721
+#: mail/em-folder-tree.c:2733
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: mail/em-folder-tree.c:2722
+#: mail/em-folder-tree.c:2734
 msgid "_Move..."
 msgstr "_Move..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2726
+#: mail/em-folder-tree.c:2738
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2729
+#: mail/em-folder-tree.c:2741
 msgid "_Rename..."
 msgstr "_Rename..."
 
@@ -13644,116 +13649,116 @@ msgstr "Retrieving `%s'"
 msgid "Valid signature but cannot verify sender"
 msgstr "Valid signature but cannot verify sender"
 
-#: mail/em-format-html.c:846
+#: mail/em-format-html.c:869
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:899
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:910
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: mail/em-format-html.c:889
+#: mail/em-format-html.c:912
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: mail/em-format-html.c:910
+#: mail/em-format-html.c:933
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: mail/em-format-html.c:921
+#: mail/em-format-html.c:944
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: mail/em-format-html.c:1161
+#: mail/em-format-html.c:1184
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: mail/em-format-html.c:1437 mail/em-format-quote.c:193 mail/em-format.c:820
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:819
 #: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:326
 msgid "From"
 msgstr "From"
 
-#: mail/em-format-html.c:1437 mail/em-format-quote.c:193 mail/em-format.c:821
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:820
 #: mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/em-format-html.c:1437 mail/em-format-quote.c:193 mail/em-format.c:822
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:821
 #: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "To"
 
-#: mail/em-format-html.c:1437 mail/em-format-quote.c:193 mail/em-format.c:823
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:822
 #: mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1437 mail/em-format-quote.c:193 mail/em-format.c:824
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:823
 #: mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: mail/em-format-html.c:1550 mail/em-format-quote.c:315
+#: mail/em-format-html.c:1573 mail/em-format-quote.c:315
 #: mail/em-mailer-prefs.c:976
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1577
+#: mail/em-format-html.c:1600
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1580
+#: mail/em-format-html.c:1603
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1590 mail/em-format-quote.c:322 mail/em-format.c:826
+#: mail/em-format-html.c:1613 mail/em-format-quote.c:322 mail/em-format.c:825
 #: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/em-format-html.c:1613 mail/em-format.c:827 mail/em-mailer-prefs.c:90
+#: mail/em-format-html.c:1636 mail/em-format.c:826 mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: mail/em-format.c:1076
+#: mail/em-format.c:1075
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: mail/em-format.c:1115 mail/em-format.c:1248
+#: mail/em-format.c:1114 mail/em-format.c:1247
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: mail/em-format.c:1238
+#: mail/em-format.c:1237
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1399
+#: mail/em-format.c:1398
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1418
+#: mail/em-format.c:1417
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1426
+#: mail/em-format.c:1425
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: mail/em-format.c:1426
+#: mail/em-format.c:1425
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
@@ -13922,10 +13927,6 @@ msgstr "Messages from %s"
 msgid "Virtual _Folders"
 msgstr "Virtual _Folders"
 
-#: mail/em-vfolder-rule.c:494
-msgid "_Add"
-msgstr "_Add"
-
 #: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "VFolder source"
@@ -13988,7 +13989,7 @@ msgstr "Default height of the Message Window"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
-msgstr "Default height of the Subscribe dialog"
+msgstr "Default height of the Subscribe dialogue"
 
 #: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
@@ -14004,7 +14005,7 @@ msgstr "Default width of the Message Window"
 
 #: mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
-msgstr "Default width of the Subscribe dialog"
+msgstr "Default width of the Subscribe dialogue"
 
 #: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
@@ -14250,11 +14251,11 @@ msgstr "Spell check inline"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 msgid "Subscribe dialog default height"
-msgstr "Subscribe dialog default height"
+msgstr "Subscribe dialogue default height"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
-msgstr "Subscribe dialog default width"
+msgstr "Subscribe dialogue default width"
 
 #: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
@@ -14649,80 +14650,92 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:483
+#: mail/mail-component.c:137
+msgid "Drafts"
+msgstr "Drafts"
+
+#: mail/mail-component.c:138
+msgid "Outbox"
+msgstr "Outbox"
+
+#: mail/mail-component.c:139
+msgid "Sent"
+msgstr "Sent"
+
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: mail/mail-component.c:485
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: mail/mail-component.c:508
+#: mail/mail-component.c:509
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: mail/mail-component.c:510
+#: mail/mail-component.c:511
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: mail/mail-component.c:512
+#: mail/mail-component.c:513
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: mail/mail-component.c:516
+#: mail/mail-component.c:517
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: mail/mail-component.c:518
+#: mail/mail-component.c:519
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d unread"
 msgstr[1] ", %d unread"
 
-#: mail/mail-component.c:683
+#: mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:825
+#: mail/mail-component.c:826
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
@@ -15512,7 +15525,6 @@ 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
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
@@ -15550,7 +15562,6 @@ msgstr ""
 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
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
@@ -15665,7 +15676,6 @@ msgstr ""
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Your message with the subject \"{0}\" was not delivered."
 
-#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
@@ -15934,7 +15944,6 @@ msgstr "Cannot add vFolder \"{0}\"."
 msgid "vFolders automatically updated."
 msgstr "vFolders automatically updated."
 
-#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
 msgid ""
 "The following vFolder(s):\n"
@@ -15954,7 +15963,6 @@ msgstr ""
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
 msgid ""
 "The following filter rule(s):\n"
@@ -15989,7 +15997,6 @@ msgstr "You must name this vFolder."
 msgid "No sources selected."
 msgstr "No sources selected."
 
-#. mail:vfolder-no-source secondary
 #: mail/mail-errors.xml.h:220
 msgid ""
 "You must specify at least one folder as a source.\n"
@@ -16006,7 +16013,6 @@ msgstr ""
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
-#. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
@@ -16036,7 +16042,6 @@ msgstr "_Append"
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#. mail:no-load-license secondary
 #: mail/mail-errors.xml.h:236
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
@@ -16049,7 +16054,6 @@ msgstr ""
 "until\n"
 "      you can accept its licence."
 
-#. mail:gw-accountsetup-error primary
 #: mail/mail-errors.xml.h:240
 msgid ""
 "Unable to connect to the GroupWise\n"
@@ -16058,7 +16062,6 @@ msgstr ""
 "Unable to connect to the GroupWise\n"
 "server."
 
-#. mail:gw-accountsetup-error secondary
 #: mail/mail-errors.xml.h:243
 msgid ""
 "\n"
@@ -16127,11 +16130,6 @@ msgstr "Moving messages to %s"
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:1003
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Scanning folders in \"%s\""
-
 #: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
@@ -16564,7 +16562,7 @@ msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
 msgstr ""
-"If set to true, the warning dialog in development versions of Evolution is "
+"If set to true, the warning dialogue in development versions of Evolution is "
 "not displayed."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
@@ -16591,7 +16589,7 @@ msgstr "Whether the toolbar should be visible."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
-msgstr "Whether to skip the development warning dialog"
+msgstr "Whether to skip the development warning dialogue"
 
 #: shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
@@ -16990,9 +16988,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:226
-#, no-c-format
+#, c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17076,7 +17073,6 @@ msgstr ""
 msgid "Insufficient disk space for upgrade."
 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 "
@@ -17091,7 +17087,6 @@ msgstr ""
 "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"
@@ -17100,7 +17095,6 @@ msgstr ""
 "Upgrade from previous version failed:\n"
 "{0}"
 
-#. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
@@ -17123,7 +17117,6 @@ msgstr "Continue"
 msgid "Delete old data from version {0}?"
 msgstr "Delete old data from version {0}?"
 
-#. shell:upgrade-remove-1-4 secondary
 #: shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
@@ -17154,7 +17147,6 @@ msgstr "_Keep Data"
 msgid "Really delete old data?"
 msgstr "Really delete old data?"
 
-#. shell:upgrade-remove-1-4-confirm secondary
 #: shell/shell-errors.xml.h:32
 msgid ""
 "The entire contents of the \"evolution\" directory is about to be be "
@@ -17189,7 +17181,6 @@ msgstr "Cannot start Evolution"
 msgid "Evolution can not start."
 msgstr "Evolution cannot start."
 
-#. shell:noshell secondary
 #: shell/shell-errors.xml.h:43
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
@@ -17200,7 +17191,6 @@ msgstr ""
 "\n"
 "Click help for details"
 
-#. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:51
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
@@ -17492,7 +17482,7 @@ msgstr "_Edit CA Trust"
 
 #: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
-msgstr "dialog1"
+msgstr "dialogue1"
 
 #. XXX we shouldn't be popping up dialogs in this code.
 #: smime/lib/e-cert-db.c:612
@@ -18043,7 +18033,7 @@ msgstr "Save and _Close"
 
 #: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
-msgstr "Save the item and close the dialog box"
+msgstr "Save the item and close the dialogue box"
 
 #: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
@@ -18089,7 +18079,7 @@ msgstr "Print En_velope..."
 
 #: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
-msgstr "Save the contact and close the dialog box"
+msgstr "Save the contact and close the dialogue box"
 
 #: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
@@ -18108,7 +18098,7 @@ msgstr "Delete this list"
 
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
-msgstr "Save the list and close the dialog box"
+msgstr "Save the list and close the dialogue box"
 
 #: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."