Updated Canadian English translation.

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

	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=29804

2 files changed, 157 insertions, 107 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 959873f110..13b32639eb 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-20  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-07-20  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
diff --git a/po/en_CA.po b/po/en_CA.po
index fd96ba828a..d58f2c4a9e 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-07-18 04:15-0400\n"
-"PO-Revision-Date: 2005-07-18 19:18-0400\n"
+"POT-Creation-Date: 2005-07-20 00:38-0400\n"
+"PO-Revision-Date: 2005-07-20 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"
@@ -457,6 +457,7 @@ msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
 #: addressbook/addressbook.error.xml.h:30 mail/em-vfolder-rule.c:494
+#: plugins/groupwise-features/junk-settings.glade.h:4
 #: plugins/groupwise-features/properties.glade.h:10
 msgid "_Add"
 msgstr "_Add"
@@ -2301,7 +2302,7 @@ msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: plugins/exchange-operations/exchange-delegates.c:939
-#: plugins/exchange-operations/exchange-permissions-dialog.c:696
+#: plugins/exchange-operations/exchange-permissions-dialog.c:708
 #: plugins/plugin-manager/plugin-manager.c:44
 #: plugins/save-attachments/save-attachments.c:362
 #: widgets/menus/gal-view-new-dialog.c:73
@@ -2969,7 +2970,7 @@ msgstr "Radio"
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:378
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
-#: plugins/exchange-operations/exchange-permissions-dialog.c:700
+#: plugins/exchange-operations/exchange-permissions-dialog.c:712
 msgid "Role"
 msgstr "Role"
 
@@ -3261,12 +3262,22 @@ msgstr "TLS not Available"
 msgid "No such source"
 msgstr "No such source"
 
-#. E_BOOK_ERROR_OTHER_ERROR
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Not available in offline mode"
+msgstr "Not available in offline mode"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Other error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Invalid server version"
+msgstr "Invalid server version"
+
+#: addressbook/gui/widgets/eab-gui-util.c:92
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3276,7 +3287,7 @@ msgstr ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 
-#: addressbook/gui/widgets/eab-gui-util.c:99
+#: addressbook/gui/widgets/eab-gui-util.c:101
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3285,7 +3296,7 @@ msgstr ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 
-#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3293,7 +3304,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:112
+#: addressbook/gui/widgets/eab-gui-util.c:114
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3303,7 +3314,7 @@ msgstr ""
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 
-#: addressbook/gui/widgets/eab-gui-util.c:119
+#: addressbook/gui/widgets/eab-gui-util.c:121
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3311,7 +3322,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:140
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3323,7 +3334,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:146
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3335,45 +3346,45 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: addressbook/gui/widgets/eab-gui-util.c:154
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "The backend for this addressbook was unable to parse this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "The backend for this addressbook refused to perform this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:158
+#: addressbook/gui/widgets/eab-gui-util.c:160
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:182
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
-#: addressbook/gui/widgets/eab-gui-util.c:678
+#: addressbook/gui/widgets/eab-gui-util.c:182
+#: addressbook/gui/widgets/eab-gui-util.c:680
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:191
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:191
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:203
+#: addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:203
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:205
+#: addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:285
+#: addressbook/gui/widgets/eab-gui-util.c:287
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3388,7 +3399,7 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:314
+#: addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3397,54 +3408,54 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:318
+#: addressbook/gui/widgets/eab-gui-util.c:320
 msgid "Overwrite"
 msgstr "Overwrite"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: addressbook/gui/widgets/eab-gui-util.c:363
-#: addressbook/gui/widgets/eab-gui-util.c:366
+#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:368
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacts"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:413
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:585
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:732
+#: addressbook/gui/widgets/eab-gui-util.c:734
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:734
+#: addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:737
+#: addressbook/gui/widgets/eab-gui-util.c:739
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:739
+#: addressbook/gui/widgets/eab-gui-util.c:741
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:742
+#: addressbook/gui/widgets/eab-gui-util.c:744
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:965
+#: addressbook/gui/widgets/eab-gui-util.c:967
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:968
+#: addressbook/gui/widgets/eab-gui-util.c:970
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -5016,6 +5027,7 @@ msgstr "attachment"
 #: calendar/gui/dialogs/comp-editor.c:1059
 #: calendar/gui/dialogs/meeting-page.c:889
 #: composer/e-msg-composer-attachment-bar.c:470 composer/e-msg-composer.c:3397
+#: plugins/groupwise-features/junk-settings.glade.h:8
 #: plugins/groupwise-features/properties.glade.h:14
 msgid "_Remove"
 msgstr "_Remove"
@@ -5896,7 +5908,7 @@ msgstr "<b>From:</b>"
 #: 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:1574
+#: plugins/itip-formatter/itip-formatter.c:1601
 #: 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
@@ -6440,7 +6452,7 @@ msgstr "Due Date:"
 #. Status
 #: calendar/gui/e-cal-component-preview.c:222
 #: calendar/gui/e-itip-control.c:1132
-#: plugins/exchange-operations/exchange-account-setup.c:263
+#: plugins/exchange-operations/exchange-account-setup.c:268
 #: plugins/itip-formatter/itip-view.c:907
 msgid "Status:"
 msgstr "Status:"
@@ -6505,8 +6517,8 @@ 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:1175 plugins/itip-formatter/itip-formatter.c:235
-#: plugins/itip-formatter/itip-formatter.c:1599
+#: mail/em-utils.c:1175 plugins/itip-formatter/itip-formatter.c:238
+#: plugins/itip-formatter/itip-formatter.c:1626
 #: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:205
 #: shell/e-component-registry.c:211 widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
@@ -6907,19 +6919,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:1587
+#: calendar/gui/itip-utils.c:548 plugins/itip-formatter/itip-formatter.c:1614
 msgid "Accepted"
 msgstr "Accepted"
 
 #: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:551
-#: plugins/itip-formatter/itip-formatter.c:1590
+#: plugins/itip-formatter/itip-formatter.c:1617
 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:1593
+#: plugins/itip-formatter/itip-formatter.c:1620
 msgid "Declined"
 msgstr "Declined"
 
@@ -7140,7 +7152,7 @@ msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
 #: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:1001
+#: plugins/itip-formatter/itip-formatter.c:1005
 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"
 
@@ -7302,7 +7314,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:1596
+#: plugins/itip-formatter/itip-formatter.c:1623
 msgid "Delegated"
 msgstr "Delegated"
 
@@ -10454,7 +10466,7 @@ msgstr "Defaults"
 
 #. Security settings
 #: mail/em-account-editor.c:2207 mail/mail-config.glade.h:122
-#: plugins/exchange-operations/exchange-account-setup.c:313
+#: plugins/exchange-operations/exchange-account-setup.c:316
 msgid "Security"
 msgstr "Security"
 
@@ -12342,7 +12354,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:1868
+#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1910
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
@@ -14236,11 +14248,11 @@ msgstr ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 
-#: plugins/exchange-operations/exchange-account-setup.c:251
+#: plugins/exchange-operations/exchange-account-setup.c:256
 msgid "Out Of Office"
 msgstr "Out Of Office"
 
-#: plugins/exchange-operations/exchange-account-setup.c:258
+#: plugins/exchange-operations/exchange-account-setup.c:263
 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."
@@ -14248,66 +14260,66 @@ 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-operations/exchange-account-setup.c:270
 #: plugins/exchange-operations/exchange-account-setup.c:275
+#: plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am out of the office"
 msgstr "I am out of the office"
 
-#: plugins/exchange-operations/exchange-account-setup.c:271
-#: plugins/exchange-operations/exchange-account-setup.c:274
+#: plugins/exchange-operations/exchange-account-setup.c:276
+#: plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am in the office"
 msgstr "I am in the office"
 
 #. Change Password
-#: plugins/exchange-operations/exchange-account-setup.c:323
+#: plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Change the password for Exchange account"
 
-#: plugins/exchange-operations/exchange-account-setup.c:325
+#: plugins/exchange-operations/exchange-account-setup.c:328
 #: plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Change Password"
 
 #. Delegation Assistant
-#: plugins/exchange-operations/exchange-account-setup.c:329
+#: plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Manage the delegate settings for Exchange account"
 
-#: plugins/exchange-operations/exchange-account-setup.c:331
+#: plugins/exchange-operations/exchange-account-setup.c:334
 msgid "Delegation Assitant"
 msgstr "Delegation Assitant"
 
 #. Miscelleneous settings
-#: plugins/exchange-operations/exchange-account-setup.c:342
+#: plugins/exchange-operations/exchange-account-setup.c:344
 msgid "Miscelleneous"
 msgstr "Miscelleneous"
 
 #. Folder Size
-#: plugins/exchange-operations/exchange-account-setup.c:352
+#: plugins/exchange-operations/exchange-account-setup.c:354
 msgid "View the size of all Exchange folders"
 msgstr "View the size of all Exchange folders"
 
-#: plugins/exchange-operations/exchange-account-setup.c:354
+#: plugins/exchange-operations/exchange-account-setup.c:356
 msgid "Folders Size"
 msgstr "Folders Size"
 
-#: plugins/exchange-operations/exchange-account-setup.c:361
+#: plugins/exchange-operations/exchange-account-setup.c:363
 msgid "Exchange Settings"
 msgstr "Exchange Settings"
 
-#: plugins/exchange-operations/exchange-account-setup.c:604
+#: plugins/exchange-operations/exchange-account-setup.c:606
 msgid "_OWA Url:"
 msgstr "_OWA URL:"
 
-#: plugins/exchange-operations/exchange-account-setup.c:629
+#: plugins/exchange-operations/exchange-account-setup.c:631
 msgid "A_uthenticate"
 msgstr "A_uthenticate"
 
-#: plugins/exchange-operations/exchange-account-setup.c:821
+#: plugins/exchange-operations/exchange-account-setup.c:823
 msgid "Authentication Type"
 msgstr "Authentication Type"
 
-#: plugins/exchange-operations/exchange-account-setup.c:835
+#: plugins/exchange-operations/exchange-account-setup.c:837
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
@@ -14482,11 +14494,12 @@ msgid "_Tasks:"
 msgstr "_Tasks:"
 
 #: plugins/exchange-operations/exchange-delegates-user.c:144
+#: plugins/exchange-operations/exchange-permissions-dialog.c:567
 msgid "Custom"
 msgstr "Custom"
 
 #: plugins/exchange-operations/exchange-delegates-user.c:191
-#: plugins/exchange-operations/exchange-permissions-dialog.c:181
+#: plugins/exchange-operations/exchange-permissions-dialog.c:184
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permissions for %s"
@@ -14509,7 +14522,7 @@ msgstr "Really unsubscribe from folder \"%s\"?"
 msgid "Unsubscribe from \"%s\""
 msgstr "Unsubscribe from \"%s\""
 
-#: plugins/exchange-operations/exchange-folder-permission.c:46
+#: plugins/exchange-operations/exchange-folder-permission.c:51
 #: plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permissions..."
@@ -14518,24 +14531,24 @@ msgstr "Permissions..."
 msgid "Exchange Folder Tree"
 msgstr "Exchange Folder Tree"
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:224
+#: plugins/exchange-operations/exchange-permissions-dialog.c:227
 msgid "Could not read folder permissions"
 msgstr "Could not read folder permissions"
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:266
+#: plugins/exchange-operations/exchange-permissions-dialog.c:269
 msgid "Could not update folder permissions."
 msgstr "Could not update folder permissions."
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: plugins/exchange-operations/exchange-permissions-dialog.c:298
 #, c-format
 msgid "Could not update folder permissions. %s"
 msgstr "Could not update folder permissions. %s"
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:297
+#: plugins/exchange-operations/exchange-permissions-dialog.c:300
 msgid "(Permission denied.)"
 msgstr "(Permission denied)"
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:396
+#: plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid ""
 "Unable to add user to access control list:\n"
 "No Global Catalog server is configured for this account."
@@ -14543,22 +14556,22 @@ msgstr ""
 "Unable to add user to access control list:\n"
 "No Global Catalogue server is configured for this account."
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:414
+#: plugins/exchange-operations/exchange-permissions-dialog.c:417
 #, c-format
 msgid "No such user %s"
 msgstr "No such user %s"
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:418
+#: plugins/exchange-operations/exchange-permissions-dialog.c:421
 #, c-format
 msgid "%s cannot be added to an access control list"
 msgstr "%s cannot be added to an access control list"
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:423
+#: plugins/exchange-operations/exchange-permissions-dialog.c:426
 #, c-format
 msgid "Unknown error looking up %s"
 msgstr "Unknown error looking up %s"
 
-#: plugins/exchange-operations/exchange-permissions-dialog.c:440
+#: plugins/exchange-operations/exchange-permissions-dialog.c:443
 #, c-format
 msgid "%s is already in the list"
 msgstr "%s is already in the list"
@@ -14858,6 +14871,43 @@ msgstr "Unsubscribe Folders"
 msgid "Checklist"
 msgstr "Checklist"
 
+#: plugins/groupwise-features/junk-mail-settings.c:77
+msgid "Junk Settings"
+msgstr "Junk Settings"
+
+#: plugins/groupwise-features/junk-mail-settings.c:90
+msgid "<b>Junk Mail Settings</b>"
+msgstr "<b>Junk Mail Settings</b>"
+
+#: plugins/groupwise-features/junk-mail-settings.c:112
+msgid "Junk Mail Settings..."
+msgstr "Junk Mail Settings..."
+
+#: plugins/groupwise-features/junk-settings.glade.h:1
+msgid "<b>Junk List :</b>"
+msgstr "<b>Junk List:</b>"
+
+#: plugins/groupwise-features/junk-settings.glade.h:2
+msgid "Email:"
+msgstr "Email:"
+
+#: plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Junk Mail Settings"
+
+#: plugins/groupwise-features/junk-settings.glade.h:5
+#: plugins/mail-account-disable/mail-account-disable.c:46
+msgid "_Disable"
+msgstr "_Disable"
+
+#: plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr "_Enable"
+
+#: plugins/groupwise-features/junk-settings.glade.h:7
+msgid "_Junk List"
+msgstr "_Junk List"
+
 #: plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Add Send Options to groupwise messages"
@@ -14934,66 +14984,66 @@ msgstr "New _Shared Folder..."
 msgid "Sharing"
 msgstr "Sharing"
 
-#: plugins/itip-formatter/itip-formatter.c:715
+#: plugins/itip-formatter/itip-formatter.c:719
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: plugins/itip-formatter/itip-formatter.c:768
+#: plugins/itip-formatter/itip-formatter.c:772
 #, 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:779
+#: plugins/itip-formatter/itip-formatter.c:783
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: plugins/itip-formatter/itip-formatter.c:783
+#: plugins/itip-formatter/itip-formatter.c:787
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: plugins/itip-formatter/itip-formatter.c:788
+#: plugins/itip-formatter/itip-formatter.c:792
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: plugins/itip-formatter/itip-formatter.c:793
+#: plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: plugins/itip-formatter/itip-formatter.c:886
+#: plugins/itip-formatter/itip-formatter.c:890
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer has removed the delegate %s "
 
-#: plugins/itip-formatter/itip-formatter.c:893
+#: plugins/itip-formatter/itip-formatter.c:897
 msgid "Sent a cancellation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: plugins/itip-formatter/itip-formatter.c:895
+#: plugins/itip-formatter/itip-formatter.c:899
 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:967
+#: plugins/itip-formatter/itip-formatter.c:971
 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:993
+#: plugins/itip-formatter/itip-formatter.c:997
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: plugins/itip-formatter/itip-formatter.c:997
+#: plugins/itip-formatter/itip-formatter.c:1001
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: plugins/itip-formatter/itip-formatter.c:1124
+#: plugins/itip-formatter/itip-formatter.c:1128
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: plugins/itip-formatter/itip-formatter.c:1125
+#: plugins/itip-formatter/itip-formatter.c:1129
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
@@ -15001,15 +15051,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 
-#: plugins/itip-formatter/itip-formatter.c:1159
-#: plugins/itip-formatter/itip-formatter.c:1174
-#: plugins/itip-formatter/itip-formatter.c:1250
+#: plugins/itip-formatter/itip-formatter.c:1163
+#: plugins/itip-formatter/itip-formatter.c:1178
+#: plugins/itip-formatter/itip-formatter.c:1254
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: plugins/itip-formatter/itip-formatter.c:1160
-#: plugins/itip-formatter/itip-formatter.c:1175
-#: plugins/itip-formatter/itip-formatter.c:1251
+#: plugins/itip-formatter/itip-formatter.c:1164
+#: plugins/itip-formatter/itip-formatter.c:1179
+#: plugins/itip-formatter/itip-formatter.c:1255
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -15017,11 +15067,11 @@ msgstr ""
 "The message contains a calendar, but the calendar contains no events, tasks "
 "or free/busy information"
 
-#: plugins/itip-formatter/itip-formatter.c:1185
+#: plugins/itip-formatter/itip-formatter.c:1189
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: plugins/itip-formatter/itip-formatter.c:1186
+#: plugins/itip-formatter/itip-formatter.c:1190
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -15029,26 +15079,26 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: plugins/itip-formatter/itip-formatter.c:1859
+#: plugins/itip-formatter/itip-formatter.c:1901
 msgid "Meetings and Tasks"
 msgstr "Meetings and Tasks"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1882
+#: plugins/itip-formatter/itip-formatter.c:1924
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: plugins/itip-formatter/itip-formatter.c:1892
+#: plugins/itip-formatter/itip-formatter.c:1934
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Conflict Search</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1905
+#: plugins/itip-formatter/itip-formatter.c:1947
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
-#: plugins/itip-formatter/itip-formatter.c:1922
+#: plugins/itip-formatter/itip-formatter.c:1964
 msgid "Conflict Search Table"
 msgstr "Conflict Search Table"
 
@@ -15913,10 +15963,6 @@ msgstr "Thread messages by subject"
 msgid "Fall back to threading messages by sub_ject"
 msgstr "Fall back to threading messages by sub_ject"
 
-#: plugins/mail-account-disable/mail-account-disable.c:46
-msgid "_Disable"
-msgstr "_Disable"
-
 #: plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
 msgstr "Proxy _Logout"