Updated Canadian English translation.

2005-07-02  Adam Weinberger  <adamw@gnome.org>

	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=29621

2 files changed, 501 insertions, 190 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index c763f0261b..7d957a72d3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-02  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-07-02  Terance Sola  <terance@lyse.net>
 
 	* nb.po: Updated Norwegian bokmål translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index eda9c3eed7..2274641e5f 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-06-23 19:11-0400\n"
-"PO-Revision-Date: 2005-06-23 19:18-0400\n"
+"POT-Creation-Date: 2005-07-02 16:20-0400\n"
+"PO-Revision-Date: 2005-07-02 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"
@@ -95,7 +95,7 @@ msgstr "New Appointment"
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1483
+#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1491
 msgid "New Meeting"
 msgstr "New Meeting"
 
@@ -152,7 +152,7 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:663
-#: calendar/gui/e-day-view-top-item.c:719 calendar/gui/e-day-view.c:1516
+#: calendar/gui/e-day-view-top-item.c:719 calendar/gui/e-day-view.c:1515
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -176,7 +176,7 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:689
-#: calendar/gui/e-day-view-top-item.c:723 calendar/gui/e-day-view.c:1532
+#: calendar/gui/e-day-view-top-item.c:723 calendar/gui/e-day-view.c:1531
 #: calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
@@ -545,7 +545,7 @@ msgstr "Manage your S/MIME certificates here"
 #. create the local source group
 #. On This Computer is always first and vFolders is always last
 #: addressbook/gui/component/addressbook-component.c:133
-#: addressbook/gui/component/addressbook-migrate.c:493
+#: addressbook/gui/component/addressbook-migrate.c:501
 #: calendar/gui/calendar-component.c:208 calendar/gui/migration.c:462
 #: calendar/gui/migration.c:555 calendar/gui/tasks-component.c:188
 #: mail/em-folder-tree-model.c:197 mail/em-folder-tree-model.c:199
@@ -559,7 +559,7 @@ msgstr "On This Computer"
 #. Create the default Person addressbook
 #. orange
 #: addressbook/gui/component/addressbook-component.c:141
-#: addressbook/gui/component/addressbook-migrate.c:501
+#: addressbook/gui/component/addressbook-migrate.c:509
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/calendar-component.c:216 calendar/gui/migration.c:470
 #: calendar/gui/migration.c:563 calendar/gui/tasks-component.c:196
@@ -570,7 +570,7 @@ msgstr "Personal"
 
 #. Create the LDAP source group
 #: addressbook/gui/component/addressbook-component.c:149
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
@@ -674,15 +674,15 @@ msgstr "Migrating..."
 msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Autocompletion Settings"
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: addressbook/gui/component/addressbook-migrate.c:1131
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -694,7 +694,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1145
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -704,7 +704,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: addressbook/gui/component/addressbook-migrate.c:1154
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -714,7 +714,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: addressbook/gui/component/addressbook-migrate.c:1164
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -820,8 +820,13 @@ msgstr "Whether to show the preview pane."
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-dialogs.glade.h:2
-#: mail/message-tags.glade.h:1 plugins/groupwise-features/properties.glade.h:1
+#: mail/message-tags.glade.h:1
+#: plugins/exchange-operations/exchange-change-password.glade.h:1
+#: plugins/groupwise-features/properties.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: widgets/menus/gal-view-new-dialog.glade.h:1
+#: widgets/misc/gal-categories.glade.h:1
 msgid "*"
 msgstr "*"
 
@@ -1058,6 +1063,7 @@ msgstr "_Login method:"
 #: addressbook/gui/component/ldap-config.glade.h:47
 #: calendar/gui/dialogs/calendar-setup.c:244
 #: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:165
+#: widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -1318,7 +1324,8 @@ msgstr "Address"
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard.c:174 widgets/table/e-cell-text.c:1768
+#: addressbook/gui/widgets/e-minicard.c:174
+#: widgets/menus/gal-define-views-model.c:181 widgets/table/e-cell-text.c:1768
 #: widgets/text/e-entry.c:1312 widgets/text/e-entry.c:1313
 #: widgets/text/e-text.c:3584 widgets/text/e-text.c:3585
 msgid "Editable"
@@ -2761,7 +2768,7 @@ msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:927
-#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2501
+#: calendar/gui/calendar-commands.c:119 calendar/gui/print.c:2501
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-mail-message.xml.h:74 ui/evolution-tasks.xml.h:14
 msgid "Print"
@@ -2981,7 +2988,8 @@ msgstr "Web Site"
 #: widgets/table/e-table-group-leaf.c:629
 #: widgets/table/e-table-group-leaf.c:630 widgets/table/e-table-item.c:3008
 #: widgets/table/e-table-item.c:3009 widgets/text/e-text.c:3626
-#: widgets/text/e-text.c:3627
+#: widgets/text/e-text.c:3627 widgets/table/e-table-group-container.c:971
+#: widgets/table/e-table-group-container.c:972
 msgid "Width"
 msgstr "Width"
 
@@ -2993,7 +3001,8 @@ msgstr "Width"
 #: widgets/table/e-table-group-leaf.c:622
 #: widgets/table/e-table-group-leaf.c:623 widgets/table/e-table-item.c:3014
 #: widgets/table/e-table-item.c:3015 widgets/text/e-text.c:3634
-#: widgets/text/e-text.c:3635
+#: widgets/text/e-text.c:3635 widgets/table/e-table-group-container.c:964
+#: widgets/table/e-table-group-container.c:965
 msgid "Height"
 msgstr "Height"
 
@@ -4111,15 +4120,15 @@ msgstr "Enter password"
 msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
+#: calendar/conduits/calendar/calendar-conduit.c:1361
+#: calendar/conduits/calendar/calendar-conduit.c:1362
 #: calendar/conduits/todo/todo-conduit.c:879
 #: calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Could not start evolution-data-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: calendar/conduits/calendar/calendar-conduit.c:1470
+#: calendar/conduits/calendar/calendar-conduit.c:1473
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
@@ -4170,7 +4179,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution's Tasks component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1222 calendar/gui/print.c:1822
+#: calendar/gui/e-tasks.c:1242 calendar/gui/print.c:1822
 #: calendar/gui/tasks-component.c:519 calendar/gui/tasks-component.c:994
 #: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
 #: calendar/importers/icalendar-importer.c:701
@@ -4227,8 +4236,10 @@ msgstr "Snooze _time:"
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
-#: mail/mail-config.glade.h:158 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: mail/mail-config.glade.h:158
+#: plugins/exchange-operations/exchange-delegates.glade.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:41
+#: ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -4672,14 +4683,14 @@ msgstr "Location contains"
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:708
-#: calendar/gui/dialogs/calendar-setup.c:369 calendar/gui/gnome-cal.c:1974
+#: calendar/gui/calendar-commands.c:119 calendar/gui/calendar-component.c:708
+#: calendar/gui/dialogs/calendar-setup.c:369 calendar/gui/gnome-cal.c:2006
 #: plugins/groupwise-features/camel-gw-listener.c:382
 #: plugins/groupwise-features/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:355
+#: calendar/gui/calendar-commands.c:354
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4689,11 +4700,11 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: calendar/gui/calendar-commands.c:361
+#: calendar/gui/calendar-commands.c:360
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: calendar/gui/calendar-commands.c:366
+#: calendar/gui/calendar-commands.c:365
 #: calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
 #: plugins/calendar-http/calendar-http.c:265
@@ -4721,7 +4732,7 @@ msgid "Weather"
 msgstr "Weather"
 
 #: calendar/gui/calendar-component.c:535
-#: calendar/gui/dialogs/calendar-setup.c:450
+#: calendar/gui/dialogs/calendar-setup.c:451
 msgid "New Calendar"
 msgstr "New Calendar"
 
@@ -5346,11 +5357,11 @@ msgstr "C_olour:"
 msgid "Tasks List"
 msgstr "Tasks List"
 
-#: calendar/gui/dialogs/calendar-setup.c:448
+#: calendar/gui/dialogs/calendar-setup.c:449
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: calendar/gui/dialogs/calendar-setup.c:515
+#: calendar/gui/dialogs/calendar-setup.c:517
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
@@ -5476,7 +5487,7 @@ msgstr[0] "Attached message"
 msgstr[1] "%d attached messages"
 
 #: calendar/gui/dialogs/comp-editor.c:421 calendar/gui/e-calendar-table.c:1164
-#: calendar/gui/e-calendar-view.c:1513 composer/e-msg-composer.c:2899
+#: calendar/gui/e-calendar-view.c:1521 composer/e-msg-composer.c:2899
 #: mail/em-folder-tree.c:1047 mail/em-folder-view.c:1033
 #: mail/message-list.c:1708 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
@@ -5550,13 +5561,13 @@ msgstr "Journal entry - %s"
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:2142
-#: calendar/gui/dialogs/comp-editor.c:2175
-#: calendar/gui/dialogs/comp-editor.c:2199
+#: calendar/gui/dialogs/comp-editor.c:2141
+#: calendar/gui/dialogs/comp-editor.c:2174
+#: calendar/gui/dialogs/comp-editor.c:2198
 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:2223
+#: calendar/gui/dialogs/comp-editor.c:2222
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -5632,30 +5643,30 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:142 calendar/gui/print.c:2298
+#: calendar/gui/dialogs/event-editor.c:141 calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Appointment"
 
-#: calendar/gui/dialogs/event-editor.c:151
+#: calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:170
-#: calendar/gui/dialogs/event-editor.c:254
-#: calendar/gui/dialogs/event-editor.c:426
+#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:420
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:180
+#: calendar/gui/dialogs/event-editor.c:174
 msgid "Delegatees"
 msgstr "Delegatees"
 
-#: calendar/gui/dialogs/event-editor.c:184
+#: calendar/gui/dialogs/event-editor.c:178
 msgid "Attendees"
 msgstr "Attendees"
 
-#: calendar/gui/dialogs/event-editor.c:257
-#: calendar/gui/dialogs/event-editor.c:429
+#: calendar/gui/dialogs/event-editor.c:251
+#: calendar/gui/dialogs/event-editor.c:423
 msgid "Invitations"
 msgstr "Invitations"
 
@@ -5764,8 +5775,8 @@ msgid "Classi_fication:"
 msgstr "Classi_fication:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305 calendar/gui/e-calendar-table.c:362
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:254
+#: calendar/gui/e-cal-model.c:324 calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Confidential"
 
@@ -5779,15 +5790,15 @@ msgstr "Locat_ion:"
 
 #: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-cal-list-view.c:254 calendar/gui/e-cal-model.c:303
+#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:322
 #: calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "Private"
 
 #: calendar/gui/dialogs/event-page.glade.h:18
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-cal-model.c:301 calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-cal-list-view.c:252 calendar/gui/e-cal-model.c:313
+#: calendar/gui/e-cal-model.c:320 calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Public"
 
@@ -5843,6 +5854,7 @@ msgstr "<b>From:</b>"
 #: mail/em-account-prefs.c:437 mail/em-folder-view.c:1062
 #: plugins/calendar-weather/calendar-weather.c:371
 #: plugins/calendar-weather/calendar-weather.c:425
+#: plugins/exchange-operations/exchange-delegates.glade.h:7
 #: plugins/itip-formatter/itip-formatter.c:1539
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:465
@@ -6158,7 +6170,7 @@ msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:899
+#: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:918
 #: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
@@ -6384,11 +6396,10 @@ msgid "Due Date:"
 msgstr "Due Date:"
 
 #. write status
-#. translators: exchange out of office status header
 #. Status
 #: calendar/gui/e-cal-component-preview.c:222
 #: calendar/gui/e-itip-control.c:1132
-#: plugins/exchange-account-setup/exchange-account-setup.c:227
+#: plugins/exchange-operations/exchange-account-setup.c:251
 #: plugins/itip-formatter/itip-view.c:888
 msgid "Status:"
 msgstr "Status:"
@@ -6434,21 +6445,21 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
+#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:924
 #: calendar/gui/e-meeting-list-view.c:192 calendar/gui/e-meeting-store.c:168
 #: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
 #: plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Yes"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
+#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:924
 #: calendar/gui/e-meeting-list-view.c:193 calendar/gui/e-meeting-store.c:180
 #: plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
+#: calendar/gui/e-cal-model.c:326 calendar/gui/e-cal-model.c:329
 #: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
 #: calendar/gui/e-meeting-list-view.c:168
 #: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:124
@@ -6460,11 +6471,11 @@ msgstr "No"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: calendar/gui/e-cal-model.c:901
+#: calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Recurring"
 
-#: calendar/gui/e-cal-model.c:903
+#: calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Assigned"
 
@@ -6516,20 +6527,20 @@ msgstr "100%"
 msgid "Task Table"
 msgstr "Task Table"
 
-#: calendar/gui/e-calendar-table.c:694 calendar/gui/e-calendar-view.c:653
+#: calendar/gui/e-calendar-table.c:694 calendar/gui/e-calendar-view.c:661
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: calendar/gui/e-calendar-table.c:873 calendar/gui/e-calendar-view.c:780
+#: calendar/gui/e-calendar-table.c:873 calendar/gui/e-calendar-view.c:788
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: calendar/gui/e-calendar-table.c:1014 calendar/gui/e-calendar-view.c:1083
+#: calendar/gui/e-calendar-table.c:1014 calendar/gui/e-calendar-view.c:1091
 #: composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Save as..."
 
-#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1506
+#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1514
 #: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
@@ -6538,26 +6549,26 @@ msgstr "_Open"
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1515
 #: mail/em-folder-view.c:1043 mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "_Save As..."
 
-#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1487
-#: calendar/gui/e-calendar-view.c:1508 mail/em-folder-view.c:1044
+#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1495
+#: calendar/gui/e-calendar-view.c:1516 mail/em-folder-view.c:1044
 #: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:44
 #: ui/evolution-mail-message.xml.h:117 ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Print..."
 
-#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1512
+#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1520
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
-#: calendar/gui/e-calendar-table.c:1165 calendar/gui/e-calendar-view.c:1490
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1165 calendar/gui/e-calendar-view.c:1498
+#: calendar/gui/e-calendar-view.c:1522 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -6580,7 +6591,7 @@ msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1526
+#: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1534
 #: mail/em-folder-tree.c:2119 mail/em-folder-view.c:1047
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:21
@@ -6626,73 +6637,73 @@ msgstr "Start date"
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1204
+#: calendar/gui/e-calendar-view.c:1212
 msgid "Moving items"
 msgstr "Moving items"
 
-#: calendar/gui/e-calendar-view.c:1206
+#: calendar/gui/e-calendar-view.c:1214
 msgid "Copying items"
 msgstr "Copying items"
 
-#: calendar/gui/e-calendar-view.c:1481
+#: calendar/gui/e-calendar-view.c:1489
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1482
+#: calendar/gui/e-calendar-view.c:1490
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1484
+#: calendar/gui/e-calendar-view.c:1492
 msgid "New Task"
 msgstr "New Task"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1494
+#: calendar/gui/e-calendar-view.c:1502
 msgid "Current View"
 msgstr "Current View"
 
-#: calendar/gui/e-calendar-view.c:1496 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1504 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1505
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1502 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1510 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1518
+#: calendar/gui/e-calendar-view.c:1526
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1519
+#: calendar/gui/e-calendar-view.c:1527
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1520
+#: calendar/gui/e-calendar-view.c:1528
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1521
+#: calendar/gui/e-calendar-view.c:1529
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1522
+#: calendar/gui/e-calendar-view.c:1530
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1527
+#: calendar/gui/e-calendar-view.c:1535
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: calendar/gui/e-calendar-view.c:1528
+#: calendar/gui/e-calendar-view.c:1536
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1529
+#: calendar/gui/e-calendar-view.c:1537
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
@@ -6738,19 +6749,19 @@ msgstr "%02i minute divisions"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:715 calendar/gui/e-day-view.c:1499
+#: calendar/gui/e-day-view-top-item.c:715 calendar/gui/e-day-view.c:1498
 #: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:752 calendar/gui/e-week-view.c:512
+#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:512
 #: calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:755 calendar/gui/e-week-view.c:515
+#: calendar/gui/e-day-view.c:754 calendar/gui/e-week-view.c:515
 #: calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -7208,6 +7219,8 @@ msgstr "Individual"
 
 #: calendar/gui/e-meeting-list-view.c:165 calendar/gui/e-meeting-store.c:101
 #: calendar/gui/e-meeting-store.c:118
+#: widgets/table/e-table-config-no-group.glade.h:7
+#: widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Group"
 
@@ -7348,7 +7361,7 @@ msgstr "Required people and _one resource"
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:763 calendar/gui/gnome-cal.c:2412
+#: calendar/gui/e-tasks.c:783 calendar/gui/gnome-cal.c:2444
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7357,24 +7370,24 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:811
+#: calendar/gui/e-tasks.c:831
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:895
+#: calendar/gui/e-tasks.c:915
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:1091
+#: calendar/gui/e-tasks.c:1111
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1114
+#: calendar/gui/e-tasks.c:1134
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:1141
+#: calendar/gui/e-tasks.c:1161
 msgid "Expunging"
 msgstr "Expunging"
 
@@ -7389,39 +7402,41 @@ msgstr "Timezone Button"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:723
+#: calendar/gui/gnome-cal.c:722
 msgid "Updating query"
 msgstr "Updating query"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2089 widgets/menus/gal-view-menus.c:350
+#: calendar/gui/gnome-cal.c:2121 widgets/menus/gal-view-instance.c:585
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Custom View"
 
-#: calendar/gui/gnome-cal.c:2090
+#: calendar/gui/gnome-cal.c:2122 widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "Save Custom View"
 
-#: calendar/gui/gnome-cal.c:2095 widgets/menus/gal-view-menus.c:372
+#: calendar/gui/gnome-cal.c:2127 widgets/menus/gal-view-instance.c:590
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Define Views..."
 
-#: calendar/gui/gnome-cal.c:2258
+#: calendar/gui/gnome-cal.c:2290
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:2277
+#: calendar/gui/gnome-cal.c:2309
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:2378
+#: calendar/gui/gnome-cal.c:2410
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:3268
+#: calendar/gui/gnome-cal.c:3300
 msgid "Purging"
 msgstr "Purging"
 
@@ -10404,7 +10419,9 @@ msgstr "Sending Email"
 msgid "Defaults"
 msgstr "Defaults"
 
+#. Security settings
 #: mail/em-account-editor.c:2207 mail/mail-config.glade.h:122
+#: plugins/exchange-operations/exchange-account-setup.c:301
 msgid "Security"
 msgstr "Security"
 
@@ -10725,7 +10742,7 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1541
+#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1671
 #: mail/em-format-quote.c:310 mail/em-format.c:848 mail/em-mailer-prefs.c:88
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
 #: plugins/groupwise-features/properties.glade.h:7 smime/lib/e-cert.c:1131
@@ -11057,7 +11074,7 @@ msgstr "Click to mail %s"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:578
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:596
 msgid "Unsigned"
 msgstr "Unsigned"
 
@@ -11069,7 +11086,7 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:654 mail/em-format-html.c:579
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:597
 msgid "Valid signature"
 msgstr "Valid signature"
 
@@ -11081,7 +11098,7 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:580
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:598
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
@@ -11105,7 +11122,7 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:662 mail/em-format-html.c:587
+#: mail/em-format-html-display.c:662 mail/em-format-html.c:605
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
@@ -11117,7 +11134,7 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 
-#: mail/em-format-html-display.c:663 mail/em-format-html.c:588
+#: mail/em-format-html-display.c:663 mail/em-format-html.c:606
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
@@ -11131,7 +11148,7 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:664 mail/em-format-html.c:589
+#: mail/em-format-html-display.c:664 mail/em-format-html.c:607
 msgid "Encrypted"
 msgstr "Encrypted"
 
@@ -11143,7 +11160,7 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:665 mail/em-format-html.c:590
+#: mail/em-format-html-display.c:665 mail/em-format-html.c:608
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
@@ -11194,125 +11211,133 @@ msgstr "Attachment Button"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:471 mail/em-format-html.c:473
+#: mail/em-format-html.c:474 mail/em-format-html.c:476
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
 
-#: mail/em-format-html.c:581
+#: mail/em-format-html.c:599
 msgid "Valid signature but cannot verify sender"
 msgstr "Valid signature but cannot verify sender"
 
-#: mail/em-format-html.c:839
+#: mail/em-format-html.c:693
+msgid "Unknown error verifying signed messaage"
+msgstr "Unknown error verifying signed messaage"
+
+#: mail/em-format-html.c:758
+msgid "Unknown error decrypting messaage"
+msgstr "Unknown error decrypting messaage"
+
+#: mail/em-format-html.c:967
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: mail/em-format-html.c:869
+#: mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: mail/em-format-html.c:880
+#: mail/em-format-html.c:1008
 #, 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:882
+#: mail/em-format-html.c:1010
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: mail/em-format-html.c:903
+#: mail/em-format-html.c:1031
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: mail/em-format-html.c:914
+#: mail/em-format-html.c:1042
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: mail/em-format-html.c:1140
+#: mail/em-format-html.c:1270
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:197 mail/em-format.c:843
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:197 mail/em-format.c:843
 #: 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:1433 mail/em-format-quote.c:197 mail/em-format.c:844
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:197 mail/em-format.c:844
 #: mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:197 mail/em-format.c:845
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:197 mail/em-format.c:845
 #: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "To"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:197 mail/em-format.c:846
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:197 mail/em-format.c:846
 #: mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:197 mail/em-format.c:847
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:197 mail/em-format.c:847
 #: mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: mail/em-format-html.c:1545 mail/em-format-quote.c:319
+#: mail/em-format-html.c:1675 mail/em-format-quote.c:319
 #: mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1572
+#: mail/em-format-html.c:1702
 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:1575
+#: mail/em-format-html.c:1705
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1585 mail/em-format-quote.c:326 mail/em-format.c:849
+#: mail/em-format-html.c:1715 mail/em-format-quote.c:326 mail/em-format.c:849
 #: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/em-format-html.c:1608 mail/em-format.c:850 mail/em-mailer-prefs.c:90
+#: mail/em-format-html.c:1738 mail/em-format.c:850 mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: mail/em-format.c:1099
+#: mail/em-format.c:1101
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: mail/em-format.c:1138 mail/em-format.c:1271
+#: mail/em-format.c:1140 mail/em-format.c:1273
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: mail/em-format.c:1261
+#: mail/em-format.c:1263
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1409
+#: mail/em-format.c:1411
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1428
+#: mail/em-format.c:1430
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1436
+#: mail/em-format.c:1438
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: mail/em-format.c:1436
+#: mail/em-format.c:1438
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
@@ -12255,6 +12280,7 @@ msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:1
+#: widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -14159,12 +14185,12 @@ msgid "Mark as default folder"
 msgstr "Mark as default folder"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: plugins/exchange-account-setup/exchange-account-setup.c:68
+#: plugins/exchange-operations/exchange-account-setup.c:58
 msgid "Secure Password"
 msgstr "Secure Password"
 
 #. i18n: "NTLM" probably doesn't translate
-#: plugins/exchange-account-setup/exchange-account-setup.c:71
+#: plugins/exchange-operations/exchange-account-setup.c:61
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -14172,11 +14198,11 @@ msgstr ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:79
+#: plugins/exchange-operations/exchange-account-setup.c:69
 msgid "Plaintext Password"
 msgstr "Plaintext Password"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:81
+#: plugins/exchange-operations/exchange-account-setup.c:71
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -14184,12 +14210,11 @@ msgstr ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:194
-msgid "Could not read out-of-office state"
-msgstr "Could not read out-of-office state"
+#: plugins/exchange-operations/exchange-account-setup.c:239
+msgid "Out Of Office"
+msgstr "Out Of Office"
 
-#. Description section
-#: plugins/exchange-account-setup/exchange-account-setup.c:211
+#: plugins/exchange-operations/exchange-account-setup.c:246
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14197,46 +14222,138 @@ msgstr ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:239
-#: plugins/exchange-account-setup/exchange-account-setup.c:249
+#: plugins/exchange-operations/exchange-account-setup.c:258
+#: plugins/exchange-operations/exchange-account-setup.c:263
 msgid "I am out of the office"
 msgstr "I am out of the office"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:242
-#: plugins/exchange-account-setup/exchange-account-setup.c:246
+#: plugins/exchange-operations/exchange-account-setup.c:259
+#: plugins/exchange-operations/exchange-account-setup.c:262
 msgid "I am in the office"
 msgstr "I am in the office"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:275
-msgid "Out of office Message:"
-msgstr "Out of office Message:"
+#: plugins/exchange-operations/exchange-account-setup.c:309
+msgid "Change the password for Exchange account"
+msgstr "Change the password for Exchange account"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:319
+#: plugins/exchange-operations/exchange-account-setup.c:311
+#: plugins/exchange-operations/exchange-change-password.glade.h:2
+msgid "Change Password"
+msgstr "Change Password"
+
+#: plugins/exchange-operations/exchange-account-setup.c:312
+msgid "Manage the delegate settings for Exchange account"
+msgstr "Manage the delegate settings for Exchange account"
+
+#: plugins/exchange-operations/exchange-account-setup.c:314
+msgid "Delegation Assitant"
+msgstr "Delegation Assitant"
+
+#. Miscelleneous settings
+#: plugins/exchange-operations/exchange-account-setup.c:324
+msgid "Miscelleneous"
+msgstr "Miscelleneous"
+
+#: plugins/exchange-operations/exchange-account-setup.c:332
+msgid "View the size of all Exchange folders"
+msgstr "View the size of all Exchange folders"
+
+#: plugins/exchange-operations/exchange-account-setup.c:334
+msgid "Folders Size"
+msgstr "Folders Size"
+
+#: plugins/exchange-operations/exchange-account-setup.c:341
 msgid "Exchange Settings"
 msgstr "Exchange Settings"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:507
-#: plugins/exchange-account-setup/exchange-ask-password.c:200
+#: plugins/exchange-operations/exchange-account-setup.c:632
 msgid "_OWA Url:"
 msgstr "_OWA URL:"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:532
-#: plugins/exchange-account-setup/exchange-ask-password.c:193
+#: plugins/exchange-operations/exchange-account-setup.c:657
 msgid "A_uthenticate"
 msgstr "A_uthenticate"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:597
-msgid "Could not update out-of-office state"
-msgstr "Could not update out-of-office state"
-
-#: plugins/exchange-account-setup/exchange-account-setup.c:724
+#: plugins/exchange-operations/exchange-account-setup.c:849
 msgid "Authentication Type"
 msgstr "Authentication Type"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:738
+#: plugins/exchange-operations/exchange-account-setup.c:863
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
+#: plugins/exchange-operations/exchange-change-password.glade.h:3
+msgid "Confirm Password:"
+msgstr "Confirm Password:"
+
+#: plugins/exchange-operations/exchange-change-password.glade.h:4
+msgid "Current Password:"
+msgstr "Current Password:"
+
+#: plugins/exchange-operations/exchange-change-password.glade.h:5
+msgid "New Password:"
+msgstr "New Password:"
+
+#: plugins/exchange-operations/exchange-change-password.glade.h:6
+msgid "Your current password has expired. Please change your password now."
+msgstr "Your current password has expired. Please change your password now."
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "Author (read, create)"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:2
+msgid "C_alendar:"
+msgstr "C_alendar:"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:3
+msgid "Co_ntacts:"
+msgstr "Co_ntacts:"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:4
+msgid "Delegate Permissions"
+msgstr "Delegate Permissions"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:5
+msgid "Delegates"
+msgstr "Delegates"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Editor (read, create, edit)"
+msgstr "Editor (read, create, edit)"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Permissions for"
+msgstr "Permissions for"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:9
+msgid "Reviewer (read-only)"
+msgstr "Reviewer (read-only)"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+msgstr ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:12
+msgid "_Delegate can see private items"
+msgstr "_Delegate can see private items"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:14
+msgid "_Inbox:"
+msgstr "_Inbox:"
+
+#: plugins/exchange-operations/exchange-delegates.glade.h:15
+msgid "_Tasks:"
+msgstr "_Tasks:"
+
+#: plugins/exchange-operations/exchange-folder-tree.glade.h:1
+msgid "Exchange Folder Tree"
+msgstr "Exchange Folder Tree"
+
 #: plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -15022,6 +15139,8 @@ msgid "Path"
 msgstr "Path"
 
 #: plugins/plugin-manager/plugin-manager.c:48
+#: widgets/table/e-table-config-no-group.glade.h:6
+#: widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Description"
 
@@ -16232,6 +16351,8 @@ msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
 #: smime/gui/smime-ui.glade.h:49
+#: widgets/table/e-table-config-no-group.glade.h:20
+#: widgets/table/e-table-config.glade.h:21
 msgid "dialog1"
 msgstr "dialogue1"
 
@@ -17893,6 +18014,55 @@ msgstr ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 
+#: widgets/menus/gal-define-views-dialog.c:76
+#: widgets/menus/gal-define-views-model.c:188
+msgid "Collection"
+msgstr "Collection"
+
+#: widgets/menus/gal-define-views-dialog.c:325
+#: widgets/menus/gal-define-views.glade.h:4
+#, no-c-format
+msgid "Define Views for %s"
+msgstr "Define Views for %s"
+
+#: widgets/menus/gal-define-views-dialog.c:333
+#: widgets/menus/gal-define-views-dialog.c:335
+msgid "Define Views"
+msgstr "Define Views"
+
+#: widgets/menus/gal-define-views.glade.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Define Views for \"%s\""
+
+#: widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit..."
+msgstr "_Edit..."
+
+#: widgets/menus/gal-view-instance-save-as-dialog.c:182
+msgid "Instance"
+msgstr "Instance"
+
+#: widgets/menus/gal-view-instance-save-as-dialog.c:232
+msgid "Save Current View"
+msgstr "Save Current View"
+
+#: widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+msgid "_Create new view"
+msgstr "_Create new view"
+
+#: widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+msgid "_Replace existing view"
+msgstr "_Replace existing view"
+
+#: widgets/menus/gal-view-new-dialog.glade.h:2
+msgid "Name of new view:"
+msgstr "Name of new view:"
+
+#: widgets/menus/gal-view-new-dialog.glade.h:3
+msgid "Type of view:"
+msgstr "Type of view:"
+
 #: widgets/menus/gal-view-factory-etable.c:39
 #: widgets/table/e-table-header-item.c:1845
 #: widgets/table/e-table-scrolled.c:224 widgets/table/e-table-scrolled.c:225
@@ -17915,6 +18085,22 @@ msgstr "Factory"
 msgid "Define New View"
 msgstr "Define New View"
 
+#: widgets/misc/gal-categories.glade.h:2
+msgid "Edit Master Category List..."
+msgstr "Edit Master Category List..."
+
+#: widgets/misc/gal-categories.glade.h:3
+msgid "Item(s) belong to these _categories:"
+msgstr "Item(s) belong to these _categories:"
+
+#: widgets/misc/gal-categories.glade.h:4
+msgid "_Available Categories:"
+msgstr "_Available Categories:"
+
+#: widgets/misc/gal-categories.glade.h:5
+msgid "categories"
+msgstr "categories"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:415
@@ -17983,11 +18169,13 @@ msgstr "Y2"
 
 #: widgets/misc/e-canvas-vbox.c:102 widgets/misc/e-reflow.c:1430
 #: widgets/table/e-table-group-leaf.c:636 widgets/table/e-table-item.c:3001
+#: widgets/table/e-table-group-container.c:978
 msgid "Minimum width"
 msgstr "Minimum width"
 
 #: widgets/misc/e-canvas-vbox.c:103 widgets/misc/e-reflow.c:1431
 #: widgets/table/e-table-group-leaf.c:637 widgets/table/e-table-item.c:3002
+#: widgets/table/e-table-group-container.c:979
 msgid "Minimum Width"
 msgstr "Minimum Width"
 
@@ -18483,26 +18671,6 @@ msgstr "Colour Column"
 msgid "BG Color Column"
 msgstr "BG Colour Column"
 
-#: widgets/table/e-table-config-field.c:254
-msgid "Then By"
-msgstr "Then By"
-
-#: widgets/table/e-table-config-field.c:254
-msgid "Group By"
-msgstr "Group By"
-
-#: widgets/table/e-table-config-field.c:254
-msgid "Sort By"
-msgstr "Sort By"
-
-#: widgets/table/e-table-config-field.c:270
-msgid "Ascending"
-msgstr "Ascending"
-
-#: widgets/table/e-table-config-field.c:273
-msgid "Descending"
-msgstr "Descending"
-
 #: widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "State"
@@ -18544,33 +18712,40 @@ msgstr "Add a column..."
 #: widgets/table/e-table-group-leaf.c:573
 #: widgets/table/e-table-group-leaf.c:574 widgets/table/e-table-item.c:2959
 #: widgets/table/e-table-item.c:2960
+#: widgets/table/e-table-group-container.c:901
+#: widgets/table/e-table-group-container.c:902
 msgid "Alternating Row Colors"
 msgstr "Alternating Row Colours"
 
 #: widgets/table/e-table-group-leaf.c:580
 #: widgets/table/e-table-group-leaf.c:581 widgets/table/e-table-item.c:2966
 #: widgets/table/e-table-item.c:2967 widgets/table/e-tree.c:3271
-#: widgets/table/e-tree.c:3272
+#: widgets/table/e-tree.c:3272 widgets/table/e-table-group-container.c:908
+#: widgets/table/e-table-group-container.c:909
 msgid "Horizontal Draw Grid"
 msgstr "Horizontal Draw Grid"
 
 #: widgets/table/e-table-group-leaf.c:587
 #: widgets/table/e-table-group-leaf.c:588 widgets/table/e-table-item.c:2973
 #: widgets/table/e-table-item.c:2974 widgets/table/e-tree.c:3277
-#: widgets/table/e-tree.c:3278
+#: widgets/table/e-tree.c:3278 widgets/table/e-table-group-container.c:915
+#: widgets/table/e-table-group-container.c:916
 msgid "Vertical Draw Grid"
 msgstr "Vertical Draw Grid"
 
 #: widgets/table/e-table-group-leaf.c:594
 #: widgets/table/e-table-group-leaf.c:595 widgets/table/e-table-item.c:2980
 #: widgets/table/e-table-item.c:2981 widgets/table/e-tree.c:3283
-#: widgets/table/e-tree.c:3284
+#: widgets/table/e-tree.c:3284 widgets/table/e-table-group-container.c:922
+#: widgets/table/e-table-group-container.c:923
 msgid "Draw focus"
 msgstr "Draw focus"
 
 #: widgets/table/e-table-group-leaf.c:601
 #: widgets/table/e-table-group-leaf.c:602 widgets/table/e-table-item.c:2987
 #: widgets/table/e-table-item.c:2988
+#: widgets/table/e-table-group-container.c:929
+#: widgets/table/e-table-group-container.c:930
 msgid "Cursor mode"
 msgstr "Cursor mode"
 
@@ -18578,17 +18753,23 @@ msgstr "Cursor mode"
 #: widgets/table/e-table-group-leaf.c:609 widgets/table/e-table-item.c:2994
 #: widgets/table/e-table-item.c:2995 widgets/table/e-table.c:3316
 #: widgets/table/e-tree.c:3265 widgets/table/e-tree.c:3266
+#: widgets/table/e-table-group-container.c:943
+#: widgets/table/e-table-group-container.c:944
 msgid "Length Threshold"
 msgstr "Length Threshold"
 
 #: widgets/table/e-table-group-leaf.c:615
 #: widgets/table/e-table-group-leaf.c:616 widgets/table/e-table-item.c:2952
 #: widgets/table/e-table-item.c:2953
+#: widgets/table/e-table-group-container.c:936
+#: widgets/table/e-table-group-container.c:937
 msgid "Selection model"
 msgstr "Selection model"
 
 #: widgets/table/e-table-group-leaf.c:643
 #: widgets/table/e-table-group-leaf.c:644
+#: widgets/table/e-table-group-container.c:957
+#: widgets/table/e-table-group-container.c:958
 msgid "Frozen"
 msgstr "Frozen"
 
@@ -18596,6 +18777,8 @@ msgstr "Frozen"
 #: widgets/table/e-table-group-leaf.c:651 widgets/table/e-table-item.c:3028
 #: widgets/table/e-table-item.c:3029 widgets/table/e-table.c:3323
 #: widgets/table/e-tree.c:3297 widgets/table/e-tree.c:3298
+#: widgets/table/e-table-group-container.c:950
+#: widgets/table/e-table-group-container.c:951
 msgid "Uniform row height"
 msgstr "Uniform row height"
 
@@ -18836,3 +19019,127 @@ msgstr "IM Context"
 #: widgets/text/e-text.c:3683 widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Handle Popup"
+
+#: widgets/table/e-table-config-no-group.glade.h:1
+#: widgets/table/e-table-config.glade.h:1
+msgid "<- _Remove"
+msgstr "<- _Remove"
+
+#: widgets/table/e-table-config-no-group.glade.h:2
+#: widgets/table/e-table-config.glade.h:2
+msgid "A_vailable Fields:"
+msgstr "A_vailable Fields:"
+
+#: widgets/table/e-table-config-no-group.glade.h:3
+#: widgets/table/e-table-config.glade.h:3
+msgid "Ascending"
+msgstr "Ascending"
+
+#: widgets/table/e-table-config-no-group.glade.h:4
+#: widgets/table/e-table-config.glade.h:4
+msgid "Clear All"
+msgstr "Clear All"
+
+#: widgets/table/e-table-config-no-group.glade.h:5
+#: widgets/table/e-table-config.glade.h:5
+msgid "Descending"
+msgstr "Descending"
+
+#: widgets/table/e-table-config-no-group.glade.h:8
+#: widgets/table/e-table-config.glade.h:8
+msgid "Group Items By"
+msgstr "Group Items By"
+
+#: widgets/table/e-table-config-no-group.glade.h:9
+#: widgets/table/e-table-config.glade.h:9
+msgid "Move _Down"
+msgstr "Move _Down"
+
+#: widgets/table/e-table-config-no-group.glade.h:10
+#: widgets/table/e-table-config.glade.h:10
+msgid "Move _Up"
+msgstr "Move _Up"
+
+#: widgets/table/e-table-config-no-group.glade.h:11
+msgid "Sh_ow these fields in order:"
+msgstr "Sh_ow these fields in order:"
+
+#: widgets/table/e-table-config-no-group.glade.h:12
+#: widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "Show Fields"
+
+#: widgets/table/e-table-config-no-group.glade.h:13
+#: widgets/table/e-table-config.glade.h:12
+msgid "Show field in View"
+msgstr "Show field in View"
+
+#: widgets/table/e-table-config-no-group.glade.h:14
+#: widgets/table/e-table-config.glade.h:13
+msgid "Sort"
+msgstr "Sort"
+
+#: widgets/table/e-table-config-no-group.glade.h:15
+#: widgets/table/e-table-config.glade.h:14
+msgid "Sort Items By"
+msgstr "Sort Items By"
+
+#: widgets/table/e-table-config-no-group.glade.h:16
+#: widgets/table/e-table-config.glade.h:15
+msgid "Then By"
+msgstr "Then By"
+
+#: widgets/table/e-table-config-no-group.glade.h:17
+#: widgets/table/e-table-config.glade.h:16
+msgid "_Add ->"
+msgstr "_Add ->"
+
+#: widgets/table/e-table-config-no-group.glade.h:18
+#: widgets/table/e-table-config.glade.h:17
+msgid "_Fields Shown..."
+msgstr "_Fields Shown..."
+
+#: widgets/table/e-table-config-no-group.glade.h:19
+#: widgets/table/e-table-config.glade.h:20
+msgid "_Sort..."
+msgstr "_Sort..."
+
+#: widgets/table/e-table-config.glade.h:18
+msgid "_Group By..."
+msgstr "_Group By..."
+
+#: widgets/table/e-table-config.glade.h:19
+msgid "_Show these fields in order:"
+msgstr "_Show these fields in order:"
+
+#: widgets/table/e-table-field-chooser.glade.h:1
+msgid "Field Chooser"
+msgstr "Field Chooser"
+
+#: widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+
+#: widgets/table/e-table-group-container.c:350
+#, c-format
+msgid "%s : %s (%d item)"
+msgstr "%s : %s (%d item)"
+
+#: widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d items)"
+
+#: widgets/table/e-table-group-container.c:356
+#, c-format
+msgid "%s (%d item)"
+msgstr "%s (%d item)"
+
+#: widgets/table/e-table-group-container.c:357
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d items)"