[evolution-exchange] Updated British English translation

[Philip Withnall <pwithnall src gnome org>]

commit b7894d05092a42899a6c1fa591f156fe69ecc218
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Apr 13 11:50:50 2010 +0100

    Updated British English translation

 po/en_GB.po |  574 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 291 insertions(+), 283 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 4cc8008..d77fd17 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,18 +3,19 @@
 # This file is distributed under the same license as the evolution-exchange package.
 # Gareth Owen <gowen72 yahoo com>, 2004.
 # Bruce Cowan <bcowan fastmail co uk>, 2010.
+# Philip Withnall <philip tecnocode co uk>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-exchange\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-23 22:37+0000\n"
+"POT-Creation-Date: 2010-04-13 11:31+0100\n"
 "PO-Revision-Date: 2010-02-23 22:38+0100\n"
-"Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
+"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
 "Language-Team: British English <en li org>\n"
-"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.5.2\n"
 
@@ -29,26 +30,26 @@ msgid ""
 "current cache forever. This will work only if you have enabled offline "
 "caching for GAL."
 msgstr ""
-"This key specifies the number of days interval between the GAL cache "
-"refresh. Set this value to zero, if you don't want to update GAL and use the "
-"current cache forever. This will work only if you have enabled offline "
+"This key specifies the number of days' interval between GAL cache "
+"refreshes. Set this value to zero if you don't want to update GAL and use the "
+"current cache forever. This will only work if you have enabled offline "
 "caching for GAL."
 
-#: ../addressbook/e-book-backend-exchange.c:2305
-#: ../addressbook/e-book-backend-gal.c:1896
+#: ../addressbook/e-book-backend-exchange.c:2302
+#: ../addressbook/e-book-backend-gal.c:1900
 msgid "Searching..."
-msgstr "Searching..."
+msgstr "Searchingâ?¦"
 
-#: ../addressbook/e-book-backend-gal.c:315
-#: ../addressbook/e-book-backend-gal.c:336
+#: ../addressbook/e-book-backend-gal.c:319
+#: ../addressbook/e-book-backend-gal.c:340
 msgid "Reconnecting to LDAP server..."
-msgstr "Reconnecting to LDAP server..."
+msgstr "Reconnecting to LDAP serverâ?¦"
 
-#: ../addressbook/e-book-backend-gal.c:1657
+#: ../addressbook/e-book-backend-gal.c:1661
 msgid "Receiving LDAP search results..."
-msgstr "Receiving LDAP search results..."
+msgstr "Receiving LDAP search resultsâ?¦"
 
-#: ../addressbook/e-book-backend-gal.c:1927
+#: ../addressbook/e-book-backend-gal.c:1931
 msgid "Error performing search"
 msgstr "Error performing search"
 
@@ -57,179 +58,179 @@ msgstr "Error performing search"
 msgid "The resource '%s' is busy during the selected time period."
 msgstr "The resource '%s' is busy during the selected time period."
 
-#: ../calendar/e-cal-backend-exchange.c:425
+#: ../calendar/e-cal-backend-exchange.c:422
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../calendar/e-cal-backend-exchange.c:477
+#: ../calendar/e-cal-backend-exchange.c:474
 msgid "Could not find the calendar"
 msgstr "Could not find the calendar"
 
-#: ../camel/camel-exchange-folder.c:198
+#: ../camel/camel-exchange-folder.c:186
 msgid "You cannot expunge in offline mode."
 msgstr "You cannot expunge in offline mode."
 
-#: ../camel/camel-exchange-folder.c:226
+#: ../camel/camel-exchange-folder.c:214
 msgid "No Subject"
 msgstr "No Subject"
 
-#: ../camel/camel-exchange-folder.c:388
+#: ../camel/camel-exchange-folder.c:377
 msgid "This message is not available in offline mode."
 msgstr "This message is not available in offline mode."
 
-#: ../camel/camel-exchange-folder.c:613
+#: ../camel/camel-exchange-folder.c:603
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: ../camel/camel-exchange-folder.c:614
+#: ../camel/camel-exchange-folder.c:604
 msgid "Copying messages"
 msgstr "Copying messages"
 
-#: ../camel/camel-exchange-folder.c:982
+#: ../camel/camel-exchange-folder.c:972
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Could not create directory %s: %s"
 
-#: ../camel/camel-exchange-folder.c:992
+#: ../camel/camel-exchange-folder.c:982
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: ../camel/camel-exchange-folder.c:1000
+#: ../camel/camel-exchange-folder.c:990
 #, c-format
 msgid "Could not create cache for %s"
 msgstr "Could not create cache for %s"
 
-#: ../camel/camel-exchange-folder.c:1010
+#: ../camel/camel-exchange-folder.c:1000
 #, c-format
 msgid "Could not create journal for %s"
 msgstr "Could not create journal for %s"
 
-#: ../camel/camel-exchange-folder.c:1059
+#: ../camel/camel-exchange-folder.c:1049
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: ../camel/camel-exchange-folder.c:1084
+#: ../camel/camel-exchange-folder.c:1074
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: ../camel/camel-exchange-journal.c:333
+#: ../camel/camel-exchange-journal.c:327
 msgid "No folder name found\n"
 msgstr "No folder name found\n"
 
-#: ../camel/camel-exchange-journal.c:366 ../camel/camel-exchange-utils.c:3106
-#: ../camel/camel-exchange-utils.c:3170 ../camel/camel-exchange-utils.c:3290
-#: ../camel/camel-exchange-utils.c:3321 ../camel/camel-exchange-utils.c:3373
-#: ../camel/camel-exchange-utils.c:3394
+#: ../camel/camel-exchange-journal.c:360 ../camel/camel-exchange-utils.c:3101
+#: ../camel/camel-exchange-utils.c:3165 ../camel/camel-exchange-utils.c:3285
+#: ../camel/camel-exchange-utils.c:3316 ../camel/camel-exchange-utils.c:3368
+#: ../camel/camel-exchange-utils.c:3389
 msgid "Folder doesn't exist"
 msgstr "Folder doesn't exist"
 
-#: ../camel/camel-exchange-journal.c:428
+#: ../camel/camel-exchange-journal.c:422
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Cannot append message in offline mode: cache unavailable"
 
-#: ../camel/camel-exchange-journal.c:444
+#: ../camel/camel-exchange-journal.c:438
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "Cannot append message in offline mode: %s"
 
-#: ../camel/camel-exchange-provider.c:55
+#: ../camel/camel-exchange-provider.c:52
 msgid "Secure or Plaintext Password"
 msgstr "Secure or Plaintext Password"
 
-#: ../camel/camel-exchange-provider.c:56
-#: ../camel/camel-exchange-provider.c:143
-#: ../eplugin/exchange-account-setup.c:73
+#: ../camel/camel-exchange-provider.c:53
+#: ../camel/camel-exchange-provider.c:140
+#: ../eplugin/exchange-account-setup.c:69
 msgid "Plaintext Password"
 msgstr "Plaintext Password"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../camel/camel-exchange-provider.c:57
-#: ../camel/camel-exchange-provider.c:132
-#: ../eplugin/exchange-account-setup.c:62
+#: ../camel/camel-exchange-provider.c:54
+#: ../camel/camel-exchange-provider.c:129
+#: ../eplugin/exchange-account-setup.c:58
 msgid "Secure Password"
 msgstr "Secure Password"
 
-#: ../camel/camel-exchange-provider.c:63
+#: ../camel/camel-exchange-provider.c:60
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: ../camel/camel-exchange-provider.c:65
+#: ../camel/camel-exchange-provider.c:62
 msgid "C_heck for new messages in all folders"
 msgstr "C_heck for new messages in all folders"
 
 #. i18n: the '_' should appear before the same letter it
 #. does in the evolution:mail-config.glade "User_name"
 #. translation (or not at all)
-#: ../camel/camel-exchange-provider.c:73
+#: ../camel/camel-exchange-provider.c:70
 msgid "Windows User_name:"
 msgstr "Windows User_name:"
 
 #. i18n: GAL is an Outlookism, AD is a Windowsism
-#: ../camel/camel-exchange-provider.c:78
+#: ../camel/camel-exchange-provider.c:75
 msgid "Global Address List / Active Directory"
-msgstr "Global Address List / Active Directory"
+msgstr "Global Address List/Active Directory"
 
 #. i18n: "Global Catalog" is a Windowsism, but it's a
 #. technical term and may not have translations?
-#: ../camel/camel-exchange-provider.c:82
+#: ../camel/camel-exchange-provider.c:79
 msgid "_Global Catalog server name:"
 msgstr "_Global Catalogue server name:"
 
-#: ../camel/camel-exchange-provider.c:84
+#: ../camel/camel-exchange-provider.c:81
 #, c-format
 msgid "_Limit number of GAL responses: %s"
 msgstr "_Limit number of GAL responses: %s"
 
-#: ../camel/camel-exchange-provider.c:86
+#: ../camel/camel-exchange-provider.c:83
 msgid "Authentication _Type:"
 msgstr "Authentication _Type:"
 
-#: ../camel/camel-exchange-provider.c:88
+#: ../camel/camel-exchange-provider.c:85
 msgid "Allow _browsing of the GAL until download limit is reached"
 msgstr "Allow _browsing of the GAL until download limit is reached"
 
-#: ../camel/camel-exchange-provider.c:90
+#: ../camel/camel-exchange-provider.c:87
 msgid "_Expand groups of contacts in GAL to contact lists"
 msgstr "_Expand groups of contacts in GAL to contact lists"
 
-#: ../camel/camel-exchange-provider.c:93
+#: ../camel/camel-exchange-provider.c:90
 msgid "Options"
 msgstr "Options"
 
-#: ../camel/camel-exchange-provider.c:95
+#: ../camel/camel-exchange-provider.c:92
 #, c-format
 msgid "_Password Expiry Warning period: %s"
 msgstr "_Password Expiry Warning period: %s"
 
-#: ../camel/camel-exchange-provider.c:97
+#: ../camel/camel-exchange-provider.c:94
 msgid "Automatically synchroni_ze account locally"
 msgstr "Automatically synchroni_se account locally"
 
 #. i18n: copy from evolution:camel-imap-provider.c
-#: ../camel/camel-exchange-provider.c:100
+#: ../camel/camel-exchange-provider.c:97
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Apply filters to new messages in Inbox on this server"
 
-#: ../camel/camel-exchange-provider.c:102
+#: ../camel/camel-exchange-provider.c:99
 msgid "Check new messages for _Junk contents"
 msgstr "Check new messages for _Junk contents"
 
-#: ../camel/camel-exchange-provider.c:104
+#: ../camel/camel-exchange-provider.c:101
 msgid "Only check for Junk messag_es in the Inbox folder"
 msgstr "Only check for Junk messag_es in the Inbox folder"
 
-#: ../camel/camel-exchange-provider.c:114
+#: ../camel/camel-exchange-provider.c:111
 msgid "Microsoft Exchange"
 msgstr "Microsoft Exchange"
 
-#: ../camel/camel-exchange-provider.c:116
+#: ../camel/camel-exchange-provider.c:113
 msgid "For handling mail (and other data) on Microsoft Exchange servers"
 msgstr "For handling mail (and other data) on Microsoft Exchange servers"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../camel/camel-exchange-provider.c:135
-#: ../eplugin/exchange-account-setup.c:65
+#: ../camel/camel-exchange-provider.c:132
+#: ../eplugin/exchange-account-setup.c:61
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -237,8 +238,8 @@ msgstr ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 
-#: ../camel/camel-exchange-provider.c:145
-#: ../eplugin/exchange-account-setup.c:75
+#: ../camel/camel-exchange-provider.c:142
+#: ../eplugin/exchange-account-setup.c:71
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -246,17 +247,17 @@ msgstr ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 
-#: ../camel/camel-exchange-store.c:305
+#: ../camel/camel-exchange-store.c:303
 #, c-format
 msgid "Exchange server %s"
 msgstr "Exchange server %s"
 
-#: ../camel/camel-exchange-store.c:308
+#: ../camel/camel-exchange-store.c:306
 #, c-format
 msgid "Exchange account for %s on %s"
 msgstr "Exchange account for %s on %s"
 
-#: ../camel/camel-exchange-store.c:385
+#: ../camel/camel-exchange-store.c:383
 msgid ""
 "Could not authenticate to server. (Password incorrect?)\n"
 "\n"
@@ -264,124 +265,124 @@ msgstr ""
 "Could not authenticate to server. (Password incorrect?)\n"
 "\n"
 
-#: ../camel/camel-exchange-store.c:430
+#: ../camel/camel-exchange-store.c:428
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: ../camel/camel-exchange-store.c:502
+#: ../camel/camel-exchange-store.c:500
 msgid "Cannot subscribe folder in offline mode."
 msgstr "Cannot subscribe folder in offline mode."
 
-#: ../camel/camel-exchange-store.c:517
+#: ../camel/camel-exchange-store.c:515
 msgid "Cannot unsubscribe folder in offline mode."
 msgstr "Cannot unsubscribe folder in offline mode."
 
-#: ../camel/camel-exchange-store.c:648
+#: ../camel/camel-exchange-store.c:646
 msgid "Cannot get folder info in offline mode."
 msgstr "Cannot get folder info in offline mode."
 
-#: ../camel/camel-exchange-store.c:711
+#: ../camel/camel-exchange-store.c:709
 msgid "Cannot create folder in offline mode."
 msgstr "Cannot create folder in offline mode."
 
-#: ../camel/camel-exchange-store.c:734
+#: ../camel/camel-exchange-store.c:732
 msgid "Cannot delete folder in offline mode."
 msgstr "Cannot delete folder in offline mode."
 
-#: ../camel/camel-exchange-store.c:756
+#: ../camel/camel-exchange-store.c:754
 msgid "Cannot rename folder in offline mode."
 msgstr "Cannot rename folder in offline mode."
 
-#: ../camel/camel-exchange-transport.c:107
+#: ../camel/camel-exchange-transport.c:99
 msgid "Exchange transport can only be used with Exchange mail source"
 msgstr "Exchange transport can only be used with Exchange mail source"
 
-#: ../camel/camel-exchange-transport.c:120
+#: ../camel/camel-exchange-transport.c:112
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Cannot send message: one or more invalid recipients"
 
-#: ../camel/camel-exchange-transport.c:129
+#: ../camel/camel-exchange-transport.c:121
 msgid "Could not find 'From' address in message"
 msgstr "Could not find 'From' address in message"
 
-#: ../camel/camel-exchange-utils.c:535 ../camel/camel-exchange-utils.c:574
+#: ../camel/camel-exchange-utils.c:530 ../camel/camel-exchange-utils.c:569
 msgid "Could not get new messages"
 msgstr "Could not get new messages"
 
-#: ../camel/camel-exchange-utils.c:1062 ../camel/camel-exchange-utils.c:1213
+#: ../camel/camel-exchange-utils.c:1057 ../camel/camel-exchange-utils.c:1208
 msgid "Could not open folder"
 msgstr "Could not open folder"
 
-#: ../camel/camel-exchange-utils.c:1209 ../camel/camel-exchange-utils.c:1227
+#: ../camel/camel-exchange-utils.c:1204 ../camel/camel-exchange-utils.c:1222
 msgid "Could not open folder: Permission denied"
 msgstr "Could not open folder: Permission denied"
 
-#: ../camel/camel-exchange-utils.c:1276 ../camel/camel-exchange-utils.c:2178
+#: ../camel/camel-exchange-utils.c:1271 ../camel/camel-exchange-utils.c:2173
 msgid "No such folder"
 msgstr "No such folder"
 
-#: ../camel/camel-exchange-utils.c:1298 ../camel/camel-exchange-utils.c:3080
-#: ../camel/camel-exchange-utils.c:3123 ../camel/camel-exchange-utils.c:3294
-#: ../camel/camel-exchange-utils.c:3347 ../camel/camel-exchange-utils.c:3409
+#: ../camel/camel-exchange-utils.c:1293 ../camel/camel-exchange-utils.c:3075
+#: ../camel/camel-exchange-utils.c:3118 ../camel/camel-exchange-utils.c:3289
+#: ../camel/camel-exchange-utils.c:3342 ../camel/camel-exchange-utils.c:3404
 #: ../eplugin/org-gnome-exchange-operations.error.xml.h:51
 #: ../server/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../camel/camel-exchange-utils.c:2187
+#: ../camel/camel-exchange-utils.c:2182
 msgid "Could not create folder."
 msgstr "Could not create folder."
 
-#: ../camel/camel-exchange-utils.c:2276
+#: ../camel/camel-exchange-utils.c:2271
 msgid "Could not open Deleted Items folder"
 msgstr "Could not open Deleted Items folder"
 
-#: ../camel/camel-exchange-utils.c:2403
+#: ../camel/camel-exchange-utils.c:2398
 msgid "Could not empty Deleted Items folder"
 msgstr "Could not empty Deleted Items folder"
 
-#: ../camel/camel-exchange-utils.c:2405
+#: ../camel/camel-exchange-utils.c:2400
 msgid "Permission denied. Could not delete certain messages."
 msgstr "Permission denied. Could not delete certain messages."
 
-#: ../camel/camel-exchange-utils.c:2448
+#: ../camel/camel-exchange-utils.c:2443
 msgid "Could not append message; mailbox is over quota"
 msgstr "Could not append message; mailbox is over quota"
 
-#: ../camel/camel-exchange-utils.c:2449
+#: ../camel/camel-exchange-utils.c:2444
 msgid "Could not append message"
 msgstr "Could not append message"
 
-#: ../camel/camel-exchange-utils.c:2635
+#: ../camel/camel-exchange-utils.c:2630
 msgid "No such message"
 msgstr "No such message"
 
-#: ../camel/camel-exchange-utils.c:2707
+#: ../camel/camel-exchange-utils.c:2702
 msgid "Message has been deleted"
 msgstr "Message has been deleted"
 
-#: ../camel/camel-exchange-utils.c:2709
+#: ../camel/camel-exchange-utils.c:2704
 msgid "Error retrieving message"
 msgstr "Error retrieving message"
 
-#: ../camel/camel-exchange-utils.c:2758
+#: ../camel/camel-exchange-utils.c:2753
 msgid "Mailbox does not support full-text searching"
 msgstr "Mailbox does not support full-text searching"
 
-#: ../camel/camel-exchange-utils.c:2866
+#: ../camel/camel-exchange-utils.c:2861
 msgid "Unable to move/copy messages"
 msgstr "Unable to move/copy messages"
 
-#: ../camel/camel-exchange-utils.c:2985
+#: ../camel/camel-exchange-utils.c:2980
 msgid "No mail submission URI for this mailbox"
 msgstr "No mail submission URI for this mailbox"
 
-#: ../camel/camel-exchange-utils.c:3018
+#: ../camel/camel-exchange-utils.c:3013
 msgid "Server won't accept mail via Exchange transport"
 msgstr "Server won't accept mail via Exchange transport"
 
-#: ../camel/camel-exchange-utils.c:3020
+#: ../camel/camel-exchange-utils.c:3015
 #, c-format
 msgid ""
 "Your account does not have permission to use <%s>\n"
@@ -390,7 +391,7 @@ msgstr ""
 "Your account does not have permission to use <%s>\n"
 "as a From address."
 
-#: ../camel/camel-exchange-utils.c:3032
+#: ../camel/camel-exchange-utils.c:3027
 msgid ""
 "Could not send message.\n"
 "This might mean that your account is over quota."
@@ -398,28 +399,28 @@ msgstr ""
 "Could not send message.\n"
 "This might mean that your account is over quota."
 
-#: ../camel/camel-exchange-utils.c:3036
+#: ../camel/camel-exchange-utils.c:3031
 msgid "Could not send message"
 msgstr "Could not send message"
 
-#: ../camel/camel-exchange-utils.c:3072 ../camel/camel-exchange-utils.c:3128
-#: ../camel/camel-exchange-utils.c:3298 ../camel/camel-exchange-utils.c:3351
-#: ../camel/camel-exchange-utils.c:3415
+#: ../camel/camel-exchange-utils.c:3067 ../camel/camel-exchange-utils.c:3123
+#: ../camel/camel-exchange-utils.c:3293 ../camel/camel-exchange-utils.c:3346
+#: ../camel/camel-exchange-utils.c:3410
 #: ../eplugin/org-gnome-exchange-operations.error.xml.h:40
 #: ../server/storage/e-storage.c:557
 msgid "Generic error"
 msgstr "Generic error"
 
-#: ../camel/camel-exchange-utils.c:3076
+#: ../camel/camel-exchange-utils.c:3071
 #: ../eplugin/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: ../eplugin/exchange-account-setup.c:270
+#: ../eplugin/exchange-account-setup.c:266
 msgid "Out Of Office"
 msgstr "Out of Office"
 
-#: ../eplugin/exchange-account-setup.c:277
+#: ../eplugin/exchange-account-setup.c:273
 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."
@@ -427,99 +428,99 @@ 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."
 
-#: ../eplugin/exchange-account-setup.c:282
+#: ../eplugin/exchange-account-setup.c:278
 msgid "Status:"
 msgstr "Status:"
 
-#: ../eplugin/exchange-account-setup.c:289
-#: ../eplugin/exchange-account-setup.c:294
+#: ../eplugin/exchange-account-setup.c:285
+#: ../eplugin/exchange-account-setup.c:290
 msgid "I am out of the office"
 msgstr "I am out of the office"
 
-#: ../eplugin/exchange-account-setup.c:290
-#: ../eplugin/exchange-account-setup.c:293
+#: ../eplugin/exchange-account-setup.c:286
+#: ../eplugin/exchange-account-setup.c:289
 msgid "I am in the office"
 msgstr "I am in the office"
 
 #. Security settings
-#: ../eplugin/exchange-account-setup.c:329
+#: ../eplugin/exchange-account-setup.c:325
 msgid "Security"
 msgstr "Security"
 
 #. Change Password
-#: ../eplugin/exchange-account-setup.c:340
+#: ../eplugin/exchange-account-setup.c:336
 msgid "Change the password for Exchange account"
 msgstr "Change the password for Exchange account"
 
-#: ../eplugin/exchange-account-setup.c:342
+#: ../eplugin/exchange-account-setup.c:338
 #: ../eplugin/exchange-change-password.c:85
 msgid "Change Password"
 msgstr "Change Password"
 
 #. Delegation Assistant
-#: ../eplugin/exchange-account-setup.c:347
+#: ../eplugin/exchange-account-setup.c:343
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Manage the delegate settings for Exchange account"
 
-#: ../eplugin/exchange-account-setup.c:349
+#: ../eplugin/exchange-account-setup.c:345
 msgid "Delegation Assistant"
 msgstr "Delegation Assistant"
 
 #. Miscelleneous settings
-#: ../eplugin/exchange-account-setup.c:361
+#: ../eplugin/exchange-account-setup.c:357
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
 #. Folder Size
-#: ../eplugin/exchange-account-setup.c:371
+#: ../eplugin/exchange-account-setup.c:367
 msgid "View the size of all Exchange folders"
 msgstr "View the size of all Exchange folders"
 
-#: ../eplugin/exchange-account-setup.c:373
+#: ../eplugin/exchange-account-setup.c:369
 msgid "Folders Size"
-msgstr "Folders Size"
+msgstr "Folder Size"
 
-#: ../eplugin/exchange-account-setup.c:380
+#: ../eplugin/exchange-account-setup.c:376
 #: ../eplugin/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange Settings"
 
-#: ../eplugin/exchange-account-setup.c:739
+#: ../eplugin/exchange-account-setup.c:735
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../eplugin/exchange-account-setup.c:765
+#: ../eplugin/exchange-account-setup.c:761
 msgid "A_uthenticate"
 msgstr "A_uthenticate"
 
-#: ../eplugin/exchange-account-setup.c:787
+#: ../eplugin/exchange-account-setup.c:783
 msgid "Mailbox name is _different from user name"
-msgstr "Mailbox name is _different from user name"
+msgstr "Mailbox name is _different from username"
 
-#: ../eplugin/exchange-account-setup.c:800
+#: ../eplugin/exchange-account-setup.c:796
 msgid "_Mailbox:"
 msgstr "_Mailbox:"
 
-#: ../eplugin/exchange-account-setup.c:1015
+#: ../eplugin/exchange-account-setup.c:1011
 msgid "_Authentication Type"
-msgstr "_Authentication Type:"
+msgstr "_Authentication Type"
 
-#: ../eplugin/exchange-account-setup.c:1029
+#: ../eplugin/exchange-account-setup.c:1025
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
-#: ../eplugin/exchange-account-setup.c:1144 ../eplugin/exchange-contacts.c:217
+#: ../eplugin/exchange-account-setup.c:1140 ../eplugin/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../eplugin/exchange-account-setup.c:1146 ../eplugin/exchange-contacts.c:219
+#: ../eplugin/exchange-account-setup.c:1142 ../eplugin/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
 #. FIXME: Take care of i18n
-#: ../eplugin/exchange-account-setup.c:1151 ../eplugin/exchange-calendar.c:236
+#: ../eplugin/exchange-account-setup.c:1147 ../eplugin/exchange-calendar.c:236
 #: ../eplugin/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Size:"
@@ -567,143 +568,148 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "The two passwords do not match. Please re-enter the passwords."
 
-#: ../eplugin/exchange-config-listener.c:661
+#. Translators: The %d is replaced with the actual number of days
+#: ../eplugin/exchange-config-listener.c:662
 #, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "Your password will expire in the next %d days"
+msgid "Your password will expire in the next %d day"
+msgid_plural "Your password will expire in the next %d days"
+msgstr[0] "Your password will expire in the next %d day"
+msgstr[1] "Your password will expire in the next %d days"
 
-#: ../eplugin/exchange-config-listener.c:664
+#: ../eplugin/exchange-config-listener.c:665
 msgid "Password Expiry Warning..."
-msgstr "Password Expiry Warning..."
+msgstr "Password Expiry Warningâ?¦"
 
-#: ../eplugin/exchange-config-listener.c:681
+#: ../eplugin/exchange-config-listener.c:682
 msgid "_Change Password"
 msgstr "_Change Password"
 
-#: ../eplugin/exchange-config-listener.c:734
+#: ../eplugin/exchange-config-listener.c:735
 msgid "Out of Office Assistant"
 msgstr "Out of Office Assistant"
 
-#: ../eplugin/exchange-config-listener.c:751
+#: ../eplugin/exchange-config-listener.c:752
 msgid "Currently, your status is \"Out of the Office\"."
 msgstr "Currently, your status is \"Out of the Office\"."
 
-#: ../eplugin/exchange-config-listener.c:751
+#: ../eplugin/exchange-config-listener.c:752
 msgid "Would you like to change your status to \"In the Office\"?"
 msgstr "Would you like to change your status to \"In the Office\"?"
 
-#: ../eplugin/exchange-config-listener.c:780
+#: ../eplugin/exchange-config-listener.c:781
 msgid "_No, Don't Change Status"
 msgstr "_No, Don't Change Status"
 
-#: ../eplugin/exchange-config-listener.c:801
+#: ../eplugin/exchange-config-listener.c:802
 msgid "_Yes, Change Status"
 msgstr "_Yes, Change Status"
 
-#: ../eplugin/exchange-config-listener.c:833
+#: ../eplugin/exchange-config-listener.c:834
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: ../eplugin/exchange-delegates-user.c:72 ../eplugin/exchange-folder.c:436
+#: ../eplugin/exchange-delegates-user.c:69 ../eplugin/exchange-folder.c:438
 #: ../server/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../eplugin/exchange-delegates-user.c:72 ../eplugin/exchange-folder.c:439
+#: ../eplugin/exchange-delegates-user.c:69 ../eplugin/exchange-folder.c:441
 #: ../server/storage/exchange-hierarchy-foreign.c:269
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../eplugin/exchange-delegates-user.c:72 ../eplugin/exchange-folder.c:434
+#: ../eplugin/exchange-delegates-user.c:69 ../eplugin/exchange-folder.c:436
 #: ../server/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../eplugin/exchange-delegates-user.c:72 ../eplugin/exchange-folder.c:442
+#: ../eplugin/exchange-delegates-user.c:69 ../eplugin/exchange-folder.c:444
 #: ../server/storage/exchange-hierarchy-foreign.c:261
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../eplugin/exchange-delegates-user.c:135
+#: ../eplugin/exchange-delegates-user.c:132
 #: ../eplugin/exchange-permissions-dialog.c:545
 #: ../server/lib/e2k-security-descriptor.c:901
 msgid "Custom"
 msgstr "Custom"
 
 #. To Translators: The following is a type of permissions that can be assigned by a user to his/her folders.
-#: ../eplugin/exchange-delegates-user.c:158
-#: ../eplugin/exchange-delegates-user.c:299
-#: ../eplugin/exchange-delegates-user.c:309
-#: ../eplugin/exchange-delegates-user.c:319
-#: ../eplugin/exchange-delegates-user.c:329
-msgid "Editor (read, create, edit)"
-msgstr "Editor (read, create, edit)"
-
-#. To Translators: The following is a type of permissions that can be assigned by a user to his/her folders.
-#: ../eplugin/exchange-delegates-user.c:163
+#: ../eplugin/exchange-delegates-user.c:155
 #: ../eplugin/exchange-delegates-user.c:298
 #: ../eplugin/exchange-delegates-user.c:308
 #: ../eplugin/exchange-delegates-user.c:318
 #: ../eplugin/exchange-delegates-user.c:328
-msgid "Author (read, create)"
-msgstr "Author (read, create)"
+msgid "Editor (read, create, edit)"
+msgstr "Editor (read, create, edit)"
 
 #. To Translators: The following is a type of permissions that can be assigned by a user to his/her folders.
-#: ../eplugin/exchange-delegates-user.c:168
+#: ../eplugin/exchange-delegates-user.c:160
 #: ../eplugin/exchange-delegates-user.c:297
 #: ../eplugin/exchange-delegates-user.c:307
 #: ../eplugin/exchange-delegates-user.c:317
 #: ../eplugin/exchange-delegates-user.c:327
-msgid "Reviewer (read-only)"
-msgstr "Reviewer (read-only)"
+msgid "Author (read, create)"
+msgstr "Author (read, create)"
 
-#: ../eplugin/exchange-delegates-user.c:171
+#. To Translators: The following is a type of permissions that can be assigned by a user to his/her folders.
+#: ../eplugin/exchange-delegates-user.c:165
 #: ../eplugin/exchange-delegates-user.c:296
 #: ../eplugin/exchange-delegates-user.c:306
 #: ../eplugin/exchange-delegates-user.c:316
 #: ../eplugin/exchange-delegates-user.c:326
+msgid "Reviewer (read-only)"
+msgstr "Reviewer (read-only)"
+
+#: ../eplugin/exchange-delegates-user.c:168
+#: ../eplugin/exchange-delegates-user.c:295
+#: ../eplugin/exchange-delegates-user.c:305
+#: ../eplugin/exchange-delegates-user.c:315
+#: ../eplugin/exchange-delegates-user.c:325
 #: ../server/lib/e2k-security-descriptor.c:886
 msgid "None"
 msgstr "None"
 
-#: ../eplugin/exchange-delegates-user.c:226
+#. Translators: "Delegate Permissions" refers to the permissions on the delegator's folders
+#. that the delegatee would receive
+#: ../eplugin/exchange-delegates-user.c:225
 msgid "Delegate Permissions"
 msgstr "Delegate Permissions"
 
-#: ../eplugin/exchange-delegates-user.c:244
+#: ../eplugin/exchange-delegates-user.c:243
 msgid "Permissions for"
 msgstr "Permissions for"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../eplugin/exchange-delegates-user.c:256
+#: ../eplugin/exchange-delegates-user.c:255
 msgid "C_alendar:"
 msgstr "C_alendar:"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../eplugin/exchange-delegates-user.c:265
+#: ../eplugin/exchange-delegates-user.c:264
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../eplugin/exchange-delegates-user.c:274
+#: ../eplugin/exchange-delegates-user.c:273
 msgid "_Inbox:"
 msgstr "_Inbox:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../eplugin/exchange-delegates-user.c:283
+#: ../eplugin/exchange-delegates-user.c:282
 msgid "Co_ntacts:"
 msgstr "Co_ntacts:"
 
-#: ../eplugin/exchange-delegates-user.c:331
+#: ../eplugin/exchange-delegates-user.c:330
 msgid "_Summarize permissions"
-msgstr "_Summarize permissions"
+msgstr "_Summarise permissions"
 
-#: ../eplugin/exchange-delegates-user.c:335
+#: ../eplugin/exchange-delegates-user.c:334
 msgid "_Delegate can see private items"
 msgstr "_Delegate can see private items"
 
-#: ../eplugin/exchange-delegates-user.c:341
+#: ../eplugin/exchange-delegates-user.c:340
 #: ../eplugin/exchange-permissions-dialog.c:168
 #, c-format
 msgid "Permissions for %s"
@@ -712,7 +718,7 @@ msgstr "Permissions for %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../eplugin/exchange-delegates-user.c:434
+#: ../eplugin/exchange-delegates-user.c:433
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -722,25 +728,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../eplugin/exchange-delegates-user.c:439
+#: ../eplugin/exchange-delegates-user.c:438
 msgid "You have been given the following permissions on my folders:"
 msgstr "You have been given the following permissions on my folders:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../eplugin/exchange-delegates-user.c:459
+#: ../eplugin/exchange-delegates-user.c:458
 msgid "You are also permitted to see my private items."
 msgstr "You are also permitted to see my private items."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../eplugin/exchange-delegates-user.c:466
+#: ../eplugin/exchange-delegates-user.c:465
 msgid "However you are not permitted to see my private items."
-msgstr "However you are not permitted to see my private items."
+msgstr "However, you are not permitted to see my private items."
 
-#: ../eplugin/exchange-delegates-user.c:498
+#: ../eplugin/exchange-delegates-user.c:497
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "You have been designated as a delegate for %s"
@@ -802,7 +808,7 @@ msgid "_Edit"
 msgstr "_Edit"
 
 #: ../eplugin/exchange-delegates.c:995
-#: ../eplugin/exchange-permissions-dialog.c:916
+#: ../eplugin/exchange-permissions-dialog.c:920
 msgid "Name"
 msgstr "Name"
 
@@ -810,50 +816,50 @@ msgstr "Name"
 msgid "Error reading delegates list."
 msgstr "Error reading delegates list."
 
-#: ../eplugin/exchange-folder-permission.c:206
-#: ../eplugin/exchange-folder-permission.c:480
-#: ../eplugin/exchange-folder-permission.c:514
-#: ../eplugin/exchange-folder-permission.c:548
+#: ../eplugin/exchange-folder-permission.c:241
+#: ../eplugin/exchange-folder-permission.c:520
+#: ../eplugin/exchange-folder-permission.c:554
+#: ../eplugin/exchange-folder-permission.c:588
 msgid "Permissions..."
-msgstr "Permissions..."
+msgstr "Permissionsâ?¦"
 
-#: ../eplugin/exchange-folder-permission.c:208
+#: ../eplugin/exchange-folder-permission.c:243
 msgid "Check folder permissions"
 msgstr "Check folder permissions"
 
-#: ../eplugin/exchange-folder-permission.c:213
-#: ../eplugin/exchange-folder-permission.c:487
-#: ../eplugin/exchange-folder-permission.c:521
-#: ../eplugin/exchange-folder-permission.c:555
+#: ../eplugin/exchange-folder-permission.c:248
+#: ../eplugin/exchange-folder-permission.c:527
+#: ../eplugin/exchange-folder-permission.c:561
+#: ../eplugin/exchange-folder-permission.c:595
 msgid "Subscribe to Other User's Folder..."
-msgstr "Subscribe to Other User's Folder..."
+msgstr "Subscribe to Other User's Folderâ?¦"
 
-#: ../eplugin/exchange-folder-permission.c:215
-#: ../eplugin/exchange-folder-permission.c:489
-#: ../eplugin/exchange-folder-permission.c:523
-#: ../eplugin/exchange-folder-permission.c:557
+#: ../eplugin/exchange-folder-permission.c:250
+#: ../eplugin/exchange-folder-permission.c:529
+#: ../eplugin/exchange-folder-permission.c:563
+#: ../eplugin/exchange-folder-permission.c:597
 #: ../eplugin/exchange-folder-subscription.c:306
 msgid "Subscribe to Other User's Folder"
 msgstr "Subscribe to Other User's Folder"
 
-#: ../eplugin/exchange-folder-permission.c:220
-#: ../eplugin/exchange-folder-permission.c:494
-#: ../eplugin/exchange-folder-permission.c:528
-#: ../eplugin/exchange-folder-permission.c:562
+#: ../eplugin/exchange-folder-permission.c:255
+#: ../eplugin/exchange-folder-permission.c:534
+#: ../eplugin/exchange-folder-permission.c:568
+#: ../eplugin/exchange-folder-permission.c:602
 msgid "Unsubscribe Folder..."
-msgstr "Unsubscribe Folder..."
+msgstr "Unsubscribe Folderâ?¦"
 
-#: ../eplugin/exchange-folder-permission.c:482
+#: ../eplugin/exchange-folder-permission.c:522
 msgid "Check calendar permissions"
 msgstr "Check calendar permissions"
 
-#: ../eplugin/exchange-folder-permission.c:516
+#: ../eplugin/exchange-folder-permission.c:556
 msgid "Check tasks permissions"
 msgstr "Check tasks permissions"
 
-#: ../eplugin/exchange-folder-permission.c:550
+#: ../eplugin/exchange-folder-permission.c:590
 msgid "Check addressbook permissions"
-msgstr "Check addressbook permissions"
+msgstr "Check address book permissions"
 
 #: ../eplugin/exchange-folder-size-display.c:118
 msgid "Exchange Folder Tree"
@@ -884,21 +890,21 @@ msgstr "_Folder Name:"
 msgid "_User:"
 msgstr "_User:"
 
-#: ../eplugin/exchange-folder.c:324 ../eplugin/exchange-folder.c:378
+#: ../eplugin/exchange-folder.c:323 ../eplugin/exchange-folder.c:379
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Really unsubscribe from folder \"%s\"?"
 
-#: ../eplugin/exchange-folder.c:336 ../eplugin/exchange-folder.c:390
+#: ../eplugin/exchange-folder.c:336 ../eplugin/exchange-folder.c:392
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Unsubscribe from \"%s\""
 
-#: ../eplugin/exchange-mail-send-options.c:222
+#: ../eplugin/exchange-mail-send-options.c:220
 msgid "_Send Options"
 msgstr "_Send Options"
 
-#: ../eplugin/exchange-mail-send-options.c:224
+#: ../eplugin/exchange-mail-send-options.c:222
 msgid "Insert Send options"
 msgstr "Insert Send options"
 
@@ -917,73 +923,73 @@ msgid "Add User:"
 msgstr "Add User:"
 
 #: ../eplugin/exchange-permissions-dialog.c:384
-#: ../eplugin/exchange-send-options.c:467
+#: ../eplugin/exchange-send-options.c:469
 msgid "Add User"
 msgstr "Add User"
 
-#: ../eplugin/exchange-permissions-dialog.c:792
+#: ../eplugin/exchange-permissions-dialog.c:796
 msgid "Permissions"
 msgstr "Permissions"
 
-#: ../eplugin/exchange-permissions-dialog.c:809
+#: ../eplugin/exchange-permissions-dialog.c:813
 msgid "Role: "
 msgstr "Role: "
 
-#: ../eplugin/exchange-permissions-dialog.c:835
+#: ../eplugin/exchange-permissions-dialog.c:839
 msgid "Create items"
 msgstr "Create items"
 
-#: ../eplugin/exchange-permissions-dialog.c:839
+#: ../eplugin/exchange-permissions-dialog.c:843
 msgid "Read items"
 msgstr "Read items"
 
-#: ../eplugin/exchange-permissions-dialog.c:843
+#: ../eplugin/exchange-permissions-dialog.c:847
 msgid "Create subfolders"
 msgstr "Create subfolders"
 
-#: ../eplugin/exchange-permissions-dialog.c:851
+#: ../eplugin/exchange-permissions-dialog.c:855
 msgid "Cannot Edit"
 msgstr "Cannot Edit"
 
-#: ../eplugin/exchange-permissions-dialog.c:857
+#: ../eplugin/exchange-permissions-dialog.c:861
 msgid "Edit Own Items"
 msgstr "Edit Own Items"
 
-#: ../eplugin/exchange-permissions-dialog.c:863
+#: ../eplugin/exchange-permissions-dialog.c:867
 msgid "Edit Any Items"
 msgstr "Edit Any Items"
 
-#: ../eplugin/exchange-permissions-dialog.c:877
+#: ../eplugin/exchange-permissions-dialog.c:881
 msgid "Folder owner"
 msgstr "Folder owner"
 
-#: ../eplugin/exchange-permissions-dialog.c:881
+#: ../eplugin/exchange-permissions-dialog.c:885
 msgid "Folder contact"
 msgstr "Folder contact"
 
-#: ../eplugin/exchange-permissions-dialog.c:885
+#: ../eplugin/exchange-permissions-dialog.c:889
 msgid "Folder visible"
 msgstr "Folder visible"
 
-#: ../eplugin/exchange-permissions-dialog.c:893
+#: ../eplugin/exchange-permissions-dialog.c:897
 msgid "Cannot Delete"
 msgstr "Cannot Delete"
 
-#: ../eplugin/exchange-permissions-dialog.c:900
+#: ../eplugin/exchange-permissions-dialog.c:904
 msgid "Delete Own Items"
 msgstr "Delete Own Items"
 
-#: ../eplugin/exchange-permissions-dialog.c:906
+#: ../eplugin/exchange-permissions-dialog.c:910
 msgid "Delete Any Items"
 msgstr "Delete Any Items"
 
-#: ../eplugin/exchange-permissions-dialog.c:920
+#: ../eplugin/exchange-permissions-dialog.c:924
 msgid "Role"
 msgstr "Role"
 
 #: ../eplugin/exchange-send-options.c:337
 msgid "Exchange - Send Options"
-msgstr "Exchange - Send Options"
+msgstr "Exchange â?? Send Options"
 
 #: ../eplugin/exchange-send-options.c:358
 msgid "Message Settings"
@@ -993,62 +999,64 @@ msgstr "Message Settings"
 msgid "I_mportance: "
 msgstr "I_mportance: "
 
-#: ../eplugin/exchange-send-options.c:379
+#. Translators: Here's set a message sensitivity, which means for exchange
+#. one of Normal, Personal, Private, Confidential.
+#: ../eplugin/exchange-send-options.c:381
 msgid "_Sensitivity: "
 msgstr "_Sensitivity: "
 
-#: ../eplugin/exchange-send-options.c:391
-#: ../eplugin/exchange-send-options.c:401
+#: ../eplugin/exchange-send-options.c:393
+#: ../eplugin/exchange-send-options.c:403
 msgid "Normal"
 msgstr "Normal"
 
-#: ../eplugin/exchange-send-options.c:392
+#: ../eplugin/exchange-send-options.c:394
 msgid "Personal"
 msgstr "Personal"
 
-#: ../eplugin/exchange-send-options.c:393
+#: ../eplugin/exchange-send-options.c:395
 msgid "Private"
 msgstr "Private"
 
-#: ../eplugin/exchange-send-options.c:394
+#: ../eplugin/exchange-send-options.c:396
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../eplugin/exchange-send-options.c:402
+#: ../eplugin/exchange-send-options.c:404
 msgid "High"
 msgstr "High"
 
-#: ../eplugin/exchange-send-options.c:403
+#: ../eplugin/exchange-send-options.c:405
 msgid "Low"
 msgstr "Low"
 
-#: ../eplugin/exchange-send-options.c:405
+#: ../eplugin/exchange-send-options.c:407
 msgid "Send as Delegate"
 msgstr "Send as Delegate"
 
-#: ../eplugin/exchange-send-options.c:422
+#: ../eplugin/exchange-send-options.c:424
 msgid "_User"
 msgstr "_User"
 
-#: ../eplugin/exchange-send-options.c:430
+#: ../eplugin/exchange-send-options.c:432
 msgid "Tracking Options"
 msgstr "Tracking Options"
 
-#: ../eplugin/exchange-send-options.c:438
+#: ../eplugin/exchange-send-options.c:440
 msgid "Request a _delivery receipt for this message"
 msgstr "Request a _delivery receipt for this message"
 
-#: ../eplugin/exchange-send-options.c:443
+#: ../eplugin/exchange-send-options.c:445
 msgid "Request a _read receipt for this message"
 msgstr "Request a _read receipt for this message"
 
-#: ../eplugin/exchange-user-dialog.c:131
+#: ../eplugin/exchange-user-dialog.c:135
 msgid "Select User"
 msgstr "Select User"
 
-#: ../eplugin/exchange-user-dialog.c:170
+#: ../eplugin/exchange-user-dialog.c:174
 msgid "Address Book..."
-msgstr "Address Book..."
+msgstr "Address Bookâ?¦"
 
 #: ../eplugin/org-gnome-exchange-operations.eplug.xml.h:1
 msgid "Activates the Evolution-Exchange extension package."
@@ -1218,7 +1226,7 @@ msgstr "Make sure the URL is correct and try again."
 
 #: ../eplugin/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr "Make sure the server name is spelled correctly and try again."
+msgstr "Make sure the server name is spelt correctly and try again."
 
 #: ../eplugin/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
@@ -1293,7 +1301,7 @@ msgstr ""
 "you to specify the Windows domain name \n"
 "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
 "\n"
-"Also, you may have typed your password wrongly."
+"Also, you may have typed your password incorrectly."
 
 #: ../eplugin/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
@@ -1490,7 +1498,7 @@ msgstr "Cannot create a folder with that name"
 
 #: ../server/storage/e-storage.c:585
 msgid "This operation cannot be performed in off-line mode"
-msgstr "This operation cannot be performed in off-line mode"
+msgstr "This operation cannot be performed in offline mode"
 
 #: ../server/storage/e-storage.c:587
 msgid "Unknown error"
@@ -1541,11 +1549,11 @@ msgstr "Outbox"
 msgid "Sent Items"
 msgstr "Sent Items"
 
-#: ../tools/exchange-autoconfig-wizard.c:176
+#: ../tools/exchange-autoconfig-wizard.c:177
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../tools/exchange-autoconfig-wizard.c:176
+#: ../tools/exchange-autoconfig-wizard.c:177
 msgid ""
 "Welcome to Evolution Connector for Microsoft Exchange.\n"
 "The next few screens will help you configure Evolution\n"
@@ -1559,13 +1567,13 @@ msgstr ""
 "\n"
 "Please click the \"Forward\" button to continue."
 
-#: ../tools/exchange-autoconfig-wizard.c:188
-#: ../tools/exchange-autoconfig-wizard.c:361
-#: ../tools/exchange-autoconfig-wizard.c:448
+#: ../tools/exchange-autoconfig-wizard.c:189
+#: ../tools/exchange-autoconfig-wizard.c:362
+#: ../tools/exchange-autoconfig-wizard.c:449
 msgid "Exchange Configuration"
 msgstr "Exchange Configuration"
 
-#: ../tools/exchange-autoconfig-wizard.c:188
+#: ../tools/exchange-autoconfig-wizard.c:189
 msgid ""
 "Evolution Connector for Microsoft Exchange can use account information from "
 "your existing Outlook Web Access (OWA) account.\n"
@@ -1579,23 +1587,23 @@ msgstr ""
 "Enter your OWA site address (URL), username, and password, then click "
 "\"Forward\".\n"
 
-#: ../tools/exchange-autoconfig-wizard.c:196
+#: ../tools/exchange-autoconfig-wizard.c:197
 msgid "OWA _URL:"
 msgstr "OWA _URL:"
 
-#: ../tools/exchange-autoconfig-wizard.c:200
+#: ../tools/exchange-autoconfig-wizard.c:201
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../tools/exchange-autoconfig-wizard.c:204
+#: ../tools/exchange-autoconfig-wizard.c:205
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../tools/exchange-autoconfig-wizard.c:209
+#: ../tools/exchange-autoconfig-wizard.c:210
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: ../tools/exchange-autoconfig-wizard.c:282
+#: ../tools/exchange-autoconfig-wizard.c:283
 #, c-format
 msgid ""
 "Could not connect to the Exchange server.\n"
@@ -1604,7 +1612,7 @@ msgstr ""
 "Could not connect to the Exchange server.\n"
 "Make sure the URL is correct (try \"%s\" instead of \"%s\"?) and try again."
 
-#: ../tools/exchange-autoconfig-wizard.c:290
+#: ../tools/exchange-autoconfig-wizard.c:291
 msgid ""
 "Could not locate Exchange server.\n"
 "Make sure the server name is spelled correctly and try again."
@@ -1612,7 +1620,7 @@ msgstr ""
 "Could not locate Exchange server.\n"
 "Make sure the server name is spelt correctly and try again."
 
-#: ../tools/exchange-autoconfig-wizard.c:299
+#: ../tools/exchange-autoconfig-wizard.c:300
 msgid ""
 "Could not authenticate to the Exchange server.\n"
 "Make sure the username and password are correct and try again."
@@ -1620,7 +1628,7 @@ msgstr ""
 "Could not authenticate to the Exchange server.\n"
 "Make sure the username and password are correct and try again."
 
-#: ../tools/exchange-autoconfig-wizard.c:306
+#: ../tools/exchange-autoconfig-wizard.c:307
 #, c-format
 msgid ""
 "Could not authenticate to the Exchange server.\n"
@@ -1635,7 +1643,7 @@ msgstr ""
 "You may need to specify the Windows domain name as part of your username "
 "(eg, \"MY-DOMAIN\\%s\")."
 
-#: ../tools/exchange-autoconfig-wizard.c:318
+#: ../tools/exchange-autoconfig-wizard.c:319
 msgid ""
 "Could not find OWA data at the indicated URL.\n"
 "Make sure the URL is correct and try again."
@@ -1643,7 +1651,7 @@ msgstr ""
 "Could not find OWA data at the indicated URL.\n"
 "Make sure the URL is correct and try again."
 
-#: ../tools/exchange-autoconfig-wizard.c:324
+#: ../tools/exchange-autoconfig-wizard.c:325
 msgid ""
 "Evolution Connector for Microsoft Exchange requires access to certain "
 "functionality on the Exchange server that appears to be disabled or "
@@ -1663,7 +1671,7 @@ msgstr ""
 "For information to provide to your Exchange administrator, please follow the "
 "link below:"
 
-#: ../tools/exchange-autoconfig-wizard.c:337
+#: ../tools/exchange-autoconfig-wizard.c:338
 msgid ""
 "The Exchange server URL you provided is for an Exchange 5.5 server. "
 "Evolution Connector for Microsoft Exchange supports Microsoft Exchange 2000 "
@@ -1673,7 +1681,7 @@ msgstr ""
 "Evolution Connector for Microsoft Exchange supports Microsoft Exchange 2000 "
 "and 2003 only."
 
-#: ../tools/exchange-autoconfig-wizard.c:345
+#: ../tools/exchange-autoconfig-wizard.c:346
 msgid ""
 "Could not configure Exchange account because an unknown error occurred. "
 "Check the URL, username, and password, and try again."
@@ -1681,7 +1689,7 @@ msgstr ""
 "Could not configure Exchange account because an unknown error occurred. "
 "Check the URL, username, and password, and try again."
 
-#: ../tools/exchange-autoconfig-wizard.c:361
+#: ../tools/exchange-autoconfig-wizard.c:362
 msgid ""
 "Evolution Connector for Microsoft Exchange could not find the Global Catalog "
 "replica for your site. Please enter the name of your Global Catalog server. "
@@ -1692,11 +1700,11 @@ msgstr ""
 "Catalogue server. You may need to ask your system administrator for the "
 "correct value."
 
-#: ../tools/exchange-autoconfig-wizard.c:369
+#: ../tools/exchange-autoconfig-wizard.c:370
 msgid "GC _Server:"
 msgstr "GC _Server:"
 
-#: ../tools/exchange-autoconfig-wizard.c:402
+#: ../tools/exchange-autoconfig-wizard.c:403
 #, c-format
 msgid ""
 "Could not authenticate to the Global Catalog server. You may need to go back "
@@ -1707,7 +1715,7 @@ msgstr ""
 "back and specify the Windows domain name as part of your username (eg, \"MY-"
 "DOMAIN\\%s\")."
 
-#: ../tools/exchange-autoconfig-wizard.c:409
+#: ../tools/exchange-autoconfig-wizard.c:410
 msgid ""
 "Could not connect to specified server.\n"
 "Please check the server name and try again."
@@ -1715,11 +1723,11 @@ msgstr ""
 "Could not connect to specified server.\n"
 "Please check the server name and try again."
 
-#: ../tools/exchange-autoconfig-wizard.c:421
+#: ../tools/exchange-autoconfig-wizard.c:422
 msgid "Configuration Failed"
 msgstr "Configuration Failed"
 
-#: ../tools/exchange-autoconfig-wizard.c:421
+#: ../tools/exchange-autoconfig-wizard.c:422
 msgid ""
 "Evolution Connector for Microsoft Exchange has encountered a problem "
 "configuring your Exchange account."
@@ -1727,7 +1735,7 @@ msgstr ""
 "Evolution Connector for Microsoft Exchange has encountered a problem "
 "configuring your Exchange account."
 
-#: ../tools/exchange-autoconfig-wizard.c:448
+#: ../tools/exchange-autoconfig-wizard.c:449
 msgid ""
 "Your account information is as follows. Please correct any errors, then "
 "click \"Forward\"."
@@ -1735,28 +1743,28 @@ msgstr ""
 "Your account information is as follows. Please correct any errors, then "
 "click \"Forward\"."
 
-#: ../tools/exchange-autoconfig-wizard.c:456
+#: ../tools/exchange-autoconfig-wizard.c:457
 msgid "Full _Name:"
 msgstr "Full _Name:"
 
-#: ../tools/exchange-autoconfig-wizard.c:460
+#: ../tools/exchange-autoconfig-wizard.c:461
 msgid "_Email Address:"
 msgstr "_E-mail Address:"
 
-#: ../tools/exchange-autoconfig-wizard.c:464
+#: ../tools/exchange-autoconfig-wizard.c:465
 msgid "Make this my _default account"
 msgstr "Make this my _default account"
 
-#: ../tools/exchange-autoconfig-wizard.c:481
-#: ../tools/exchange-autoconfig-wizard.c:485
+#: ../tools/exchange-autoconfig-wizard.c:482
+#: ../tools/exchange-autoconfig-wizard.c:486
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../tools/exchange-autoconfig-wizard.c:508
+#: ../tools/exchange-autoconfig-wizard.c:509
 msgid "Done"
 msgstr "Done"
 
-#: ../tools/exchange-autoconfig-wizard.c:508
+#: ../tools/exchange-autoconfig-wizard.c:509
 msgid ""
 "Your Connector account is now ready to use. Click the \"Apply\" button to "
 "save your settings."
@@ -1764,7 +1772,7 @@ msgstr ""
 "Your Connector account is now ready to use. Click the \"Apply\" button to "
 "save your settings."
 
-#: ../tools/exchange-autoconfig-wizard.c:542
+#: ../tools/exchange-autoconfig-wizard.c:543
 msgid ""
 "Configuration system error.\n"
 "Unable to create new account."
@@ -1772,11 +1780,11 @@ msgstr ""
 "Configuration system error.\n"
 "Unable to create new account."
 
-#: ../tools/exchange-autoconfig-wizard.c:556
+#: ../tools/exchange-autoconfig-wizard.c:557
 msgid "You may only configure a single Exchange account"
 msgstr "You may only configure a single Exchange account"
 
-#: ../tools/exchange-autoconfig-wizard.c:731
+#: ../tools/exchange-autoconfig-wizard.c:732
 msgid "Evolution Connector for Microsoft Exchange Configuration"
 msgstr "Evolution Connector for Microsoft Exchange Configuration"
 
@@ -1794,7 +1802,7 @@ msgstr "Get the size of personal folders"
 
 #: ../tools/ximian-connector.xml.h:4
 msgid "Subscribe to _Other User's Folder..."
-msgstr "Subscribe to _Other User's Folder..."
+msgstr "Subscribe to _Other User's Folderâ?¦"
 
 #: ../tools/ximian-connector.xml.h:5
 msgid "Subscribe to a folder belonging to some other user on the server"
@@ -1816,7 +1824,7 @@ msgstr "View or change your Out-of-Office status and autoreply message"
 
 #: ../tools/ximian-connector.xml.h:9
 msgid "_Change Exchange Password..."
-msgstr "_Change Exchange Password..."
+msgstr "_Change Exchange Passwordâ?¦"
 
 #: ../tools/ximian-connector.xml.h:10
 msgid "_Delegation Assistant"