Updated Canadian English translation.

2005-08-13  Adam Weinberger  <adamw@gnome.org>

	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=30106

2 files changed, 266 insertions, 263 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index ad5f24ecb7..21e6b02d92 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-13  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-08-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index 683c9694bd..1c93fe5acd 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: 2005-08-08 02:58-0400\n"
-"PO-Revision-Date: 2005-08-08 19:18-0400\n"
+"POT-Creation-Date: 2005-08-13 14:16-0400\n"
+"PO-Revision-Date: 2005-08-13 19:18-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -888,7 +888,7 @@ msgid "Add Address Book"
 msgstr "Add Address Book"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:302 mail/em-account-editor.c:757
+#: mail/em-account-editor.c:302 mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Always"
 
@@ -923,7 +923,7 @@ msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:300 mail/em-account-editor.c:756
+#: mail/em-account-editor.c:300 mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Never"
 
@@ -1104,7 +1104,7 @@ msgstr "cards"
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1949 plugins/calendar-http/calendar-http.c:263
+#: mail/em-account-editor.c:1951 plugins/calendar-http/calendar-http.c:263
 #: plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "minutes"
@@ -1146,13 +1146,13 @@ 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:183
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -1160,9 +1160,9 @@ msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:523
-#: addressbook/gui/contact-editor/e-contact-editor.c:538
-#: addressbook/gui/contact-editor/e-contact-editor.c:2338
+#: addressbook/gui/contact-editor/e-contact-editor.c:525
+#: addressbook/gui/contact-editor/e-contact-editor.c:540
+#: addressbook/gui/contact-editor/e-contact-editor.c:2349
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -1203,7 +1203,7 @@ msgstr "Telephone"
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1042 mail/mail-config.c:77
 #: mail/mail-config.glade.h:153
 msgid "Work"
@@ -1328,7 +1328,7 @@ msgstr "Address"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:310
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
@@ -2324,7 +2324,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
@@ -2334,7 +2334,7 @@ msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
@@ -2355,69 +2355,69 @@ msgid "Username"
 msgstr "Username"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Home"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
 #: addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 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:286
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Required Fields"
 msgstr "Required Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:306
+#: addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:533
-#: addressbook/gui/contact-editor/e-contact-editor.c:2333
+#: addressbook/gui/contact-editor/e-contact-editor.c:535
+#: addressbook/gui/contact-editor/e-contact-editor.c:2344
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor - %s"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2639
+#: addressbook/gui/contact-editor/e-contact-editor.c:2650
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2651
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2916
+#: addressbook/gui/contact-editor/e-contact-editor.c:2927
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2425,7 +2425,7 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2968
+#: addressbook/gui/contact-editor/e-contact-editor.c:2979
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
@@ -3260,7 +3260,7 @@ msgstr "Could not cancel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: calendar/gui/comp-editor-factory.c:438
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
@@ -4245,7 +4245,7 @@ msgstr "Evolution's Tasks component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 #: calendar/gui/e-tasks.c:1256 calendar/gui/print.c:1822
-#: calendar/gui/tasks-component.c:519 calendar/gui/tasks-component.c:994
+#: calendar/gui/tasks-component.c:519 calendar/gui/tasks-component.c:1006
 #: calendar/gui/tasks-control.c:457 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:707
 #: plugins/groupwise-account-setup/camel-gw-listener.c:384
@@ -4273,11 +4273,11 @@ msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:248
 msgid "Start time"
 msgstr "Start time"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:312
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4886,19 +4886,19 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/comp-editor-factory.c:413
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Method not supported when opening the calendar"
 msgstr "Method not supported when opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:432
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
-#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1286
+#: calendar/gui/comp-editor-factory.c:444 shell/e-shell.c:1286
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -5043,14 +5043,14 @@ msgstr "%.0fG"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:311
 #: calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: calendar/gui/dialogs/comp-editor.c:2426
+#: calendar/gui/dialogs/comp-editor.c:2447
 #: composer/e-msg-composer-attachment-bar.c:307 mail/em-utils.c:444
 #: mail/em-utils.c:481 widgets/misc/e-attachment-bar.c:336
 msgid "attachment"
 msgstr "attachment"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:473
-#: calendar/gui/dialogs/comp-editor.c:1059
+#: calendar/gui/dialogs/comp-editor.c:1077
 #: calendar/gui/dialogs/meeting-page.c:889
 #: composer/e-msg-composer-attachment-bar.c:470 composer/e-msg-composer.c:3398
 #: plugins/groupwise-features/junk-settings.glade.h:8
@@ -5060,21 +5060,21 @@ msgid "_Remove"
 msgstr "_Remove"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:474
-#: calendar/gui/dialogs/comp-editor.c:1060
+#: calendar/gui/dialogs/comp-editor.c:1078
 #: composer/e-msg-composer-attachment-bar.c:471 composer/e-msg-composer.c:3399
-#: mail/em-folder-tree.c:2120 ui/evolution-mail-list.xml.h:28
+#: mail/em-folder-tree.c:2047 ui/evolution-mail-list.xml.h:28
 msgid "_Properties"
 msgstr "_Properties"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:476
-#: calendar/gui/dialogs/comp-editor.c:1062
+#: calendar/gui/dialogs/comp-editor.c:1080
 #: composer/e-msg-composer-attachment-bar.c:473 composer/e-msg-composer.c:3401
 msgid "_Add attachment..."
 msgstr "_Add attachment..."
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:736
 #: composer/e-msg-composer-attachment-bar.c:740
-#: widgets/misc/e-attachment-bar.c:898
+#: widgets/misc/e-attachment-bar.c:904
 msgid "Attachment Bar"
 msgstr "Attachment Bar"
 
@@ -5559,14 +5559,14 @@ msgstr " (Due "
 msgid "Due "
 msgstr "Due "
 
-#: calendar/gui/dialogs/comp-editor.c:187 composer/e-msg-composer.c:2663
+#: calendar/gui/dialogs/comp-editor.c:190 composer/e-msg-composer.c:2663
 #, c-format
 msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
-#: calendar/gui/dialogs/comp-editor.c:192
-#: calendar/gui/dialogs/comp-editor.c:362 composer/e-msg-composer.c:2668
+#: calendar/gui/dialogs/comp-editor.c:195
+#: calendar/gui/dialogs/comp-editor.c:365 composer/e-msg-composer.c:2668
 #: composer/e-msg-composer.c:2845
 #, c-format
 msgid "Attached message"
@@ -5574,88 +5574,88 @@ msgid_plural "%d attached messages"
 msgstr[0] "Attached message"
 msgstr[1] "%d attached messages"
 
-#: calendar/gui/dialogs/comp-editor.c:425 calendar/gui/e-calendar-table.c:1162
+#: calendar/gui/dialogs/comp-editor.c:428 calendar/gui/e-calendar-table.c:1162
 #: calendar/gui/e-calendar-view.c:1536 composer/e-msg-composer.c:2909
-#: mail/em-folder-tree.c:1047 mail/em-folder-view.c:1035
+#: mail/em-folder-tree.c:974 mail/em-folder-view.c:1035
 #: mail/message-list.c:1708 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:100 ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Copy"
 
-#: calendar/gui/dialogs/comp-editor.c:426 composer/e-msg-composer.c:2910
-#: mail/em-folder-tree.c:1048 mail/em-folder-utils.c:380
+#: calendar/gui/dialogs/comp-editor.c:429 composer/e-msg-composer.c:2910
+#: mail/em-folder-tree.c:975 mail/em-folder-utils.c:368
 #: mail/em-folder-view.c:931 mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Move"
 
-#: calendar/gui/dialogs/comp-editor.c:428 composer/e-msg-composer.c:2912
-#: mail/em-folder-tree.c:1050 mail/message-list.c:1711
+#: calendar/gui/dialogs/comp-editor.c:431 composer/e-msg-composer.c:2912
+#: mail/em-folder-tree.c:977 mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: calendar/gui/dialogs/comp-editor.c:765
+#: calendar/gui/dialogs/comp-editor.c:771
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: calendar/gui/dialogs/comp-editor.c:956 composer/e-msg-composer.c:2317
+#: calendar/gui/dialogs/comp-editor.c:971 composer/e-msg-composer.c:2317
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Attachment"
 msgstr[1] "<b>%d</b> Attachments"
 
-#: calendar/gui/dialogs/comp-editor.c:1225
+#: calendar/gui/dialogs/comp-editor.c:1242
 msgid "_Attachment Bar (drop attachments here)"
 msgstr "_Attachment Bar (drop attachments here)"
 
-#: calendar/gui/dialogs/comp-editor.c:1839
-#: calendar/gui/dialogs/comp-editor.c:1882
+#: calendar/gui/dialogs/comp-editor.c:1856
+#: calendar/gui/dialogs/comp-editor.c:1899
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: calendar/gui/dialogs/comp-editor.c:1845
-#: calendar/gui/dialogs/comp-editor.c:1888
+#: calendar/gui/dialogs/comp-editor.c:1862
+#: calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1847
-#: calendar/gui/dialogs/comp-editor.c:1890
+#: calendar/gui/dialogs/comp-editor.c:1864
+#: calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1851
-#: calendar/gui/dialogs/comp-editor.c:1894
+#: calendar/gui/dialogs/comp-editor.c:1868
+#: calendar/gui/dialogs/comp-editor.c:1911
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1853
-#: calendar/gui/dialogs/comp-editor.c:1896
+#: calendar/gui/dialogs/comp-editor.c:1870
+#: calendar/gui/dialogs/comp-editor.c:1913
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1856
-#: calendar/gui/dialogs/comp-editor.c:1899
+#: calendar/gui/dialogs/comp-editor.c:1873
+#: calendar/gui/dialogs/comp-editor.c:1916
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1867
-#: calendar/gui/dialogs/comp-editor.c:1909
+#: calendar/gui/dialogs/comp-editor.c:1884
+#: calendar/gui/dialogs/comp-editor.c:1926
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:2515
-#: calendar/gui/dialogs/comp-editor.c:2548
-#: calendar/gui/dialogs/comp-editor.c:2572
+#: calendar/gui/dialogs/comp-editor.c:2536
+#: calendar/gui/dialogs/comp-editor.c:2569
+#: calendar/gui/dialogs/comp-editor.c:2593
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: calendar/gui/dialogs/comp-editor.c:2596
+#: calendar/gui/dialogs/comp-editor.c:2617
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -5939,12 +5939,12 @@ msgstr "<b>From:</b>"
 #: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:1104
 #: composer/e-msg-composer.c:2121 filter/filter-rule.c:881
-#: mail/em-account-editor.c:683 mail/em-account-editor.c:1346
+#: mail/em-account-editor.c:683 mail/em-account-editor.c:1348
 #: mail/em-account-prefs.c:464 mail/em-folder-view.c:1064
 #: mail/em-junk-hook.c:78 plugins/calendar-weather/calendar-weather.c:370
 #: plugins/calendar-weather/calendar-weather.c:424
 #: plugins/exchange-operations/exchange-delegates.glade.h:7
-#: plugins/itip-formatter/itip-formatter.c:1607
+#: plugins/itip-formatter/itip-formatter.c:1615
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:465
 #: widgets/misc/e-dateedit.c:1504 widgets/misc/e-dateedit.c:1673
@@ -6461,7 +6461,7 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2707
+#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -6553,10 +6553,10 @@ msgstr "No"
 #: calendar/gui/e-meeting-list-view.c:168
 #: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:124
 #: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1244 plugins/itip-formatter/itip-formatter.c:238
-#: plugins/itip-formatter/itip-formatter.c:1632
+#: mail/em-utils.c:1244 plugins/itip-formatter/itip-formatter.c:240
+#: plugins/itip-formatter/itip-formatter.c:1640
 #: plugins/plugin-manager/plugin-manager.c:72
-#: widgets/misc/e-attachment-bar.c:643 widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-attachment-bar.c:649 widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -6677,7 +6677,7 @@ msgstr "_Mark Selected Tasks as Complete"
 
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/e-calendar-table.c:1174 calendar/gui/e-calendar-view.c:1549
-#: mail/em-folder-tree.c:2116 mail/em-folder-view.c:1049
+#: mail/em-folder-tree.c:2043 mail/em-folder-view.c:1049
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:22
 msgid "_Delete"
@@ -6956,19 +6956,19 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:204
 #: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:548 plugins/itip-formatter/itip-formatter.c:1620
+#: calendar/gui/itip-utils.c:548 plugins/itip-formatter/itip-formatter.c:1628
 msgid "Accepted"
 msgstr "Accepted"
 
 #: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:551
-#: plugins/itip-formatter/itip-formatter.c:1623
+#: plugins/itip-formatter/itip-formatter.c:1631
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
 #: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:205
 #: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
 #: calendar/gui/itip-utils.c:554 calendar/gui/itip-utils.c:583
-#: plugins/itip-formatter/itip-formatter.c:1626
+#: plugins/itip-formatter/itip-formatter.c:1634
 msgid "Declined"
 msgstr "Declined"
 
@@ -7189,7 +7189,7 @@ msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
 #: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:1011
+#: plugins/itip-formatter/itip-formatter.c:1013
 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"
 
@@ -7353,7 +7353,7 @@ msgstr "Tentative"
 
 #: calendar/gui/e-meeting-list-view.c:207 calendar/gui/e-meeting-store.c:194
 #: calendar/gui/e-meeting-store.c:217 calendar/gui/itip-utils.c:557
-#: plugins/itip-formatter/itip-formatter.c:1629
+#: plugins/itip-formatter/itip-formatter.c:1637
 msgid "Delegated"
 msgstr "Delegated"
 
@@ -7922,7 +7922,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:517 mail/mail-component.c:546
+#: calendar/gui/tasks-component.c:517 mail/mail-component.c:547
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7933,52 +7933,52 @@ msgstr[1] ", %d selected"
 msgid "Failed upgrading tasks."
 msgstr "Failed upgrading tasks."
 
-#: calendar/gui/tasks-component.c:860
+#: calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Unable to open the task list '%s' for creating events and meetings"
 
-#: calendar/gui/tasks-component.c:875
+#: calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:969
+#: calendar/gui/tasks-component.c:981
 msgid "Task Source Selector"
 msgstr "Task Source Selector"
 
-#: calendar/gui/tasks-component.c:1152
+#: calendar/gui/tasks-component.c:1164
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:1153
+#: calendar/gui/tasks-component.c:1165
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:1154
+#: calendar/gui/tasks-component.c:1166
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:1160
+#: calendar/gui/tasks-component.c:1172
 msgid "New assigned task"
 msgstr "New assigned task"
 
-#: calendar/gui/tasks-component.c:1161
+#: calendar/gui/tasks-component.c:1173
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: calendar/gui/tasks-component.c:1162
+#: calendar/gui/tasks-component.c:1174
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: calendar/gui/tasks-component.c:1168
+#: calendar/gui/tasks-component.c:1180
 msgid "New task list"
 msgstr "New task list"
 
-#: calendar/gui/tasks-component.c:1169
+#: calendar/gui/tasks-component.c:1181
 msgid "Task l_ist"
 msgstr "Task l_ist"
 
-#: calendar/gui/tasks-component.c:1170
+#: calendar/gui/tasks-component.c:1182
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
@@ -9694,7 +9694,7 @@ msgid "Open File"
 msgstr "Open File"
 
 #: composer/e-msg-composer.c:2005 mail/em-account-editor.c:588
-#: mail/em-account-editor.c:633 mail/em-account-editor.c:698
+#: mail/em-account-editor.c:633 mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
@@ -10143,69 +10143,69 @@ msgstr "%I %p"
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: filter/filter-datespec.c:73
+#: filter/filter-datespec.c:78
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 second ago"
 msgstr[1] "1 second ago"
 
-#: filter/filter-datespec.c:74
+#: filter/filter-datespec.c:79
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minute ago"
 msgstr[1] "1 minute ago"
 
-#: filter/filter-datespec.c:75
+#: filter/filter-datespec.c:80
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hour ago"
 msgstr[1] "1 hour ago"
 
-#: filter/filter-datespec.c:76
+#: filter/filter-datespec.c:81
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 day ago"
 msgstr[1] "1 day ago"
 
-#: filter/filter-datespec.c:77
+#: filter/filter-datespec.c:82
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 week ago"
 msgstr[1] "1 week ago"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 month ago"
 msgstr[1] "1 month ago"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:84
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 year ago"
 msgstr[1] "1 year ago"
 
-#: filter/filter-datespec.c:280
+#: filter/filter-datespec.c:285
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: filter/filter-datespec.c:288 filter/filter-datespec.c:299
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: filter/filter-datespec.c:295
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:415
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
@@ -10386,15 +10386,15 @@ msgstr "the time you specify"
 msgid "years"
 msgstr "years"
 
-#: filter/rule-editor.c:285
+#: filter/rule-editor.c:290
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:366
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
-#: filter/rule-editor.c:693
+#: filter/rule-editor.c:698
 msgid "Rule name"
 msgstr "Rule name"
 
@@ -10442,8 +10442,8 @@ msgstr "Evolution Mail preferences control"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:494
 #: mail/importers/elm-importer.c:342 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:388 mail/mail-component.c:559
-#: mail/mail-component.c:646
+#: mail/importers/pine-importer.c:388 mail/mail-component.c:560
+#: mail/mail-component.c:647
 #: plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Mail"
@@ -10483,50 +10483,50 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: mail/em-account-editor.c:758
+#: mail/em-account-editor.c:760
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
-#: mail/em-account-editor.c:1722 mail/mail-config.glade.h:90
+#: mail/em-account-editor.c:1724 mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identity"
 
-#: mail/em-account-editor.c:1758 mail/mail-config.glade.h:117
+#: mail/em-account-editor.c:1760 mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Receiving Email"
 
-#: mail/em-account-editor.c:1941
+#: mail/em-account-editor.c:1943
 msgid "Automatically check for _new mail every"
 msgstr "Automatically check for _new mail every"
 
-#: mail/em-account-editor.c:2109 mail/mail-config.glade.h:128
+#: mail/em-account-editor.c:2111 mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Sending Email"
 
-#: mail/em-account-editor.c:2160 mail/mail-config.glade.h:68
+#: mail/em-account-editor.c:2162 mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Defaults"
 
 #. Security settings
-#: mail/em-account-editor.c:2219 mail/mail-config.glade.h:122
+#: mail/em-account-editor.c:2221 mail/mail-config.glade.h:122
 #: plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Security"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2256 mail/em-account-editor.c:2330
+#: mail/em-account-editor.c:2258 mail/em-account-editor.c:2332
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: mail/em-account-editor.c:2257 mail/em-account-editor.c:2331
+#: mail/em-account-editor.c:2259 mail/em-account-editor.c:2333
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: mail/em-account-editor.c:2655 mail/mail-config.glade.h:34
+#: mail/em-account-editor.c:2657 mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: mail/em-account-editor.c:2655 mail/mail-config.glade.h:80
+#: mail/em-account-editor.c:2657 mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
@@ -10890,24 +10890,24 @@ msgstr "Search Folders"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: mail/em-folder-tree-model.c:468 mail/mail-component.c:143
+#: mail/em-folder-tree-model.c:469 mail/mail-component.c:143
 msgid "Drafts"
 msgstr "Drafts"
 
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:471 mail/mail-component.c:142
+#: mail/em-folder-tree-model.c:472 mail/mail-component.c:142
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:474 mail/mail-component.c:144
+#: mail/em-folder-tree-model.c:475 mail/mail-component.c:144
 msgid "Outbox"
 msgstr "Outbox"
 
-#: mail/em-folder-tree-model.c:476 mail/mail-component.c:145
+#: mail/em-folder-tree-model.c:477 mail/mail-component.c:145
 msgid "Sent"
 msgstr "Sent"
 
-#: mail/em-folder-tree-model.c:497 mail/em-folder-tree-model.c:801
+#: mail/em-folder-tree-model.c:498 mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "Loading..."
 
@@ -10915,67 +10915,67 @@ msgstr "Loading..."
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: mail/em-folder-tree.c:922
+#: mail/em-folder-tree.c:849
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:851
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:931 mail/message-list.c:1613
+#: mail/em-folder-tree.c:858 mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:933 mail/message-list.c:1615
+#: mail/em-folder-tree.c:860 mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:949
+#: mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:1045 ui/evolution-mail-message.xml.h:101
+#: mail/em-folder-tree.c:972 ui/evolution-mail-message.xml.h:101
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:1046 ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-tree.c:973 ui/evolution-mail-message.xml.h:111
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:1751 mail/mail-ops.c:1056
+#: mail/em-folder-tree.c:1678 mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2031 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:54 ui/evolution.xml.h:45
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2032
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2036
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2037
 msgid "_Move..."
 msgstr "_Move..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2114
+#: mail/em-folder-tree.c:2041
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2117 ui/evolution-mail-list.xml.h:29
+#: mail/em-folder-tree.c:2044 ui/evolution-mail-list.xml.h:29
 msgid "_Rename..."
 msgstr "_Rename..."
 
@@ -10984,42 +10984,41 @@ msgstr "_Rename..."
 msgid "Copying `%s' to `%s'"
 msgstr "Copying `%s' to `%s'"
 
-#: mail/em-folder-utils.c:364 mail/em-folder-utils.c:380
-#: mail/em-folder-view.c:931 mail/em-folder-view.c:946
-#: mail/importers/evolution-mbox-importer.c:85
+#: mail/em-folder-utils.c:368 mail/em-folder-view.c:931
+#: mail/em-folder-view.c:946 mail/importers/evolution-mbox-importer.c:85
 #: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-utils.c:364 mail/em-folder-view.c:946
+#: mail/em-folder-utils.c:368 mail/em-folder-view.c:946
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-utils.c:515
+#: mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-utils.c:517
+#: mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-utils.c:523
+#: mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
-#: mail/em-folder-utils.c:593
+#: mail/em-folder-utils.c:581
 #: plugins/groupwise-features/share-folder-common.c:140
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-utils.c:742 plugins/groupwise-features/install-shared.c:156
+#: mail/em-folder-utils.c:730 plugins/groupwise-features/install-shared.c:156
 #: plugins/groupwise-features/share-folder-common.c:382
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-utils.c:742 plugins/groupwise-features/install-shared.c:156
+#: mail/em-folder-utils.c:730 plugins/groupwise-features/install-shared.c:156
 #: plugins/groupwise-features/share-folder-common.c:382
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
@@ -11126,37 +11125,37 @@ msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1925 mail/em-folder-view.c:1969
+#: mail/em-folder-view.c:1921 mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:2068
+#: mail/em-folder-view.c:2064
 #: plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: plugins/print-message/print-message.c:83
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:2224
+#: mail/em-folder-view.c:2220
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: mail/em-folder-view.c:2417
+#: mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2419
+#: mail/em-folder-view.c:2415
 msgid "Create _Search Folder"
 msgstr "Create _Search Folder"
 
-#: mail/em-folder-view.c:2420
+#: mail/em-folder-view.c:2416
 msgid "_From this Address"
 msgstr "_From this Address"
 
-#: mail/em-folder-view.c:2421
+#: mail/em-folder-view.c:2417
 msgid "_To this Address"
 msgstr "_To this Address"
 
-#: mail/em-folder-view.c:2702
+#: mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -11322,16 +11321,16 @@ msgstr "Save Selected..."
 #. Cant i put in the number of attachments here ?
 #: mail/em-format-html-display.c:1867
 #, c-format
-msgid "%d Attachment"
-msgid_plural "%d Attachments"
-msgstr[0] "Attachment"
-msgstr[1] "Attachments"
+msgid "%d attachment"
+msgid_plural "%d attachments"
+msgstr[0] "%d attachment"
+msgstr[1] "%d attachments"
 
-#: mail/em-format-html-display.c:1895
+#: mail/em-format-html-display.c:1921
 msgid "No Attachment"
 msgstr "No Attachment"
 
-#: mail/em-format-html-display.c:1898
+#: mail/em-format-html-display.c:1924
 msgid "Save All"
 msgstr "Save All"
 
@@ -11446,27 +11445,27 @@ msgstr "Newsgroups"
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: mail/em-format.c:1140 mail/em-format.c:1273
+#: mail/em-format.c:1140 mail/em-format.c:1279
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: mail/em-format.c:1263
+#: mail/em-format.c:1269
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1411
+#: mail/em-format.c:1417
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1430
+#: mail/em-format.c:1436
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1438
+#: mail/em-format.c:1444
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: mail/em-format.c:1438
+#: mail/em-format.c:1444
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
@@ -12287,80 +12286,80 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:507
+#: mail/mail-component.c:508
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: mail/mail-component.c:509
+#: mail/mail-component.c:510
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: mail/mail-component.c:532
+#: mail/mail-component.c:533
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: mail/mail-component.c:534
+#: mail/mail-component.c:535
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: mail/mail-component.c:536
+#: mail/mail-component.c:537
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: mail/mail-component.c:540
+#: mail/mail-component.c:541
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: mail/mail-component.c:542
+#: mail/mail-component.c:543
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d unread"
 msgstr[1] ", %d unread"
 
-#: mail/mail-component.c:763
+#: mail/mail-component.c:764
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:764
+#: mail/mail-component.c:765
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:765
+#: mail/mail-component.c:766
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:771
+#: mail/mail-component.c:772
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:772
+#: mail/mail-component.c:773
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:773
+#: mail/mail-component.c:774
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:917
+#: mail/mail-component.c:918
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
@@ -12430,7 +12429,7 @@ msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filter Options</span>"
 
-#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1916
+#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1963
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
@@ -13090,7 +13089,7 @@ msgstr "with all local and active remote folders"
 msgid "with all local folders"
 msgstr "with all local folders"
 
-#: mail/mail-folder-cache.c:813
+#: mail/mail-folder-cache.c:853
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -13109,7 +13108,7 @@ msgstr "Fetching Mail"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:574 mail/mail-ops.c:603
+#: mail/mail-ops.c:575 mail/mail-ops.c:604
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13118,114 +13117,114 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:620
+#: mail/mail-ops.c:621
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:732
+#: mail/mail-ops.c:733
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:758
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:613
+#: mail/mail-ops.c:760 mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: mail/mail-ops.c:761
+#: mail/mail-ops.c:762
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:858
+#: mail/mail-ops.c:859
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:1166
+#: mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1209
+#: mail/mail-ops.c:1210
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1281
+#: mail/mail-ops.c:1282
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1360
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1454
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1519
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1519
+#: mail/mail-ops.c:1520
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1574
+#: mail/mail-ops.c:1575
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1610 mail/mail-ops.c:1661
+#: mail/mail-ops.c:1611 mail/mail-ops.c:1662
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1659
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1660
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1743
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1852
+#: mail/mail-ops.c:1853
 #, 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:1938
+#: mail/mail-ops.c:1939
 #, 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:1988
+#: mail/mail-ops.c:1989
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13234,7 +13233,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2017
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13243,11 +13242,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2087
+#: mail/mail-ops.c:2088
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2099
+#: mail/mail-ops.c:2100
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13256,22 +13255,22 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2109
+#: mail/mail-ops.c:2110
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2259
+#: mail/mail-ops.c:2260
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2259
+#: mail/mail-ops.c:2260
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
-#: mail/mail-ops.c:2375
+#: mail/mail-ops.c:2376
 msgid "Checking Service"
 msgstr "Checking Service"
 
@@ -15171,7 +15170,7 @@ msgstr "Proxy Login"
 
 #: plugins/groupwise-features/proxy-login.c:221
 #: plugins/groupwise-features/proxy-login.c:263
-#: plugins/groupwise-features/proxy.c:474
+#: plugins/groupwise-features/proxy.c:490
 #: plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15181,7 +15180,7 @@ msgstr "%sEnter password for %s (user %s)"
 msgid "_Proxy Login..."
 msgstr "_Proxy Login..."
 
-#: plugins/groupwise-features/proxy.c:668
+#: plugins/groupwise-features/proxy.c:672
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "The Proxy tab will be available only when the account is enabled."
 
@@ -15197,7 +15196,7 @@ msgstr "Enter the users and set permissions"
 msgid "New _Shared Folder..."
 msgstr "New _Shared Folder..."
 
-#: plugins/groupwise-features/share-folder-common.c:440
+#: plugins/groupwise-features/share-folder-common.c:444
 msgid "Sharing"
 msgstr "Sharing"
 
@@ -15205,66 +15204,66 @@ msgstr "Sharing"
 msgid "Track Message Status..."
 msgstr "Track Message Status..."
 
-#: plugins/itip-formatter/itip-formatter.c:722
+#: plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: plugins/itip-formatter/itip-formatter.c:778
+#: plugins/itip-formatter/itip-formatter.c:780
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: plugins/itip-formatter/itip-formatter.c:789
+#: plugins/itip-formatter/itip-formatter.c:791
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: plugins/itip-formatter/itip-formatter.c:793
+#: plugins/itip-formatter/itip-formatter.c:795
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: plugins/itip-formatter/itip-formatter.c:798
+#: plugins/itip-formatter/itip-formatter.c:800
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: plugins/itip-formatter/itip-formatter.c:803
+#: plugins/itip-formatter/itip-formatter.c:805
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: plugins/itip-formatter/itip-formatter.c:896
+#: plugins/itip-formatter/itip-formatter.c:898
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer has removed the delegate %s "
 
-#: plugins/itip-formatter/itip-formatter.c:903
+#: plugins/itip-formatter/itip-formatter.c:905
 msgid "Sent a cancellation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: plugins/itip-formatter/itip-formatter.c:905
+#: plugins/itip-formatter/itip-formatter.c:907
 msgid "Could not send the cancellation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: plugins/itip-formatter/itip-formatter.c:977
+#: plugins/itip-formatter/itip-formatter.c:979
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: plugins/itip-formatter/itip-formatter.c:1003
+#: plugins/itip-formatter/itip-formatter.c:1005
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: plugins/itip-formatter/itip-formatter.c:1007
+#: plugins/itip-formatter/itip-formatter.c:1009
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: plugins/itip-formatter/itip-formatter.c:1134
+#: plugins/itip-formatter/itip-formatter.c:1136
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: plugins/itip-formatter/itip-formatter.c:1135
+#: plugins/itip-formatter/itip-formatter.c:1137
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
@@ -15272,15 +15271,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 
-#: plugins/itip-formatter/itip-formatter.c:1169
-#: plugins/itip-formatter/itip-formatter.c:1184
-#: plugins/itip-formatter/itip-formatter.c:1260
+#: plugins/itip-formatter/itip-formatter.c:1171
+#: plugins/itip-formatter/itip-formatter.c:1186
+#: plugins/itip-formatter/itip-formatter.c:1262
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: plugins/itip-formatter/itip-formatter.c:1170
-#: plugins/itip-formatter/itip-formatter.c:1185
-#: plugins/itip-formatter/itip-formatter.c:1261
+#: plugins/itip-formatter/itip-formatter.c:1172
+#: plugins/itip-formatter/itip-formatter.c:1187
+#: plugins/itip-formatter/itip-formatter.c:1263
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -15288,11 +15287,11 @@ msgstr ""
 "The message contains a calendar, but the calendar contains no events, tasks "
 "or free/busy information"
 
-#: plugins/itip-formatter/itip-formatter.c:1195
+#: plugins/itip-formatter/itip-formatter.c:1197
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: plugins/itip-formatter/itip-formatter.c:1196
+#: plugins/itip-formatter/itip-formatter.c:1198
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -15300,26 +15299,26 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: plugins/itip-formatter/itip-formatter.c:1907
+#: plugins/itip-formatter/itip-formatter.c:1954
 msgid "Meetings and Tasks"
 msgstr "Meetings and Tasks"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1930
+#: plugins/itip-formatter/itip-formatter.c:1977
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: plugins/itip-formatter/itip-formatter.c:1940
+#: plugins/itip-formatter/itip-formatter.c:1987
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Conflict Search</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1953
+#: plugins/itip-formatter/itip-formatter.c:2000
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
-#: plugins/itip-formatter/itip-formatter.c:1970
+#: plugins/itip-formatter/itip-formatter.c:2017
 msgid "Conflict Search Table"
 msgstr "Conflict Search Table"
 
@@ -16462,23 +16461,23 @@ msgstr "_Import"
 msgid "Evolution Settings"
 msgstr "Evolution Settings"
 
-#: shell/e-shell-utils.c:116
+#: shell/e-shell-utils.c:118
 msgid "No folder name specified."
 msgstr "No folder name specified."
 
-#: shell/e-shell-utils.c:123
+#: shell/e-shell-utils.c:125
 msgid "Folder name cannot contain the Return character."
 msgstr "Folder name cannot contain the Return character."
 
-#: shell/e-shell-utils.c:129
+#: shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Folder name cannot contain the character \"/\"."
 
-#: shell/e-shell-utils.c:135
+#: shell/e-shell-utils.c:137
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Folder name cannot contain the character \"#\"."
 
-#: shell/e-shell-utils.c:141
+#: shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
@@ -16522,19 +16521,19 @@ msgstr "_Work Offline"
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: shell/e-shell-window.c:341
+#: shell/e-shell-window.c:343
 msgid "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:349
+#: shell/e-shell-window.c:351
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is in the process of going offline."
 
-#: shell/e-shell-window.c:356
+#: shell/e-shell-window.c:358
 msgid "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:717
+#: shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"