Removed error id "camel-exception" as it was a bogus error.

2006-04-18  Jeffrey Stedfast  <fejj@novell.com>

	* mail.error.xml: Removed error id "camel-exception" as it was a
	bogus error.

2006-04-14  Jeffrey Stedfast  <fejj@novell.com>

	* em-composer-utils.c (em_utils_handle_receipt): Fixed up the if
	conditional so that 'account' wasn't ever dereferenced when
	NULL. Fixes bug #324327.

svn path=/trunk/; revision=31829

3 files changed, 338 insertions, 335 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8de907cfcb..98eaa70ac2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-18  Jeffrey Stedfast  <fejj@novell.com>
+
+	* mail.error.xml: Removed error id "camel-exception" as it was a
+	bogus error.
+
+2006-04-14  Jeffrey Stedfast  <fejj@novell.com>
+
+	* em-composer-utils.c (em_utils_handle_receipt): Fixed up the if
+	conditional so that 'account' wasn't ever dereferenced when
+	NULL. Fixes bug #324327.
+
 2006-04-10  Jeff Cai <jeff.cai@sun.com>
 
 	** Fixes 333243
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 3dcf7adcba..39824109bf 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1121,7 +1121,7 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage
 		return;
 	}
 
-	if ( (addr = camel_medium_get_header((CamelMedium *)msg, "Disposition-Notification-To")) == NULL) {
+	if ((addr = camel_medium_get_header((CamelMedium *)msg, "Disposition-Notification-To")) == NULL) {
 		camel_message_info_free(info);
 		return;
 	}
@@ -1139,9 +1139,8 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage
 			addr++;
 	}
 	
-	if (account && account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS
-	    || (account->receipt_policy == E_ACCOUNT_RECEIPT_ASK
-		&& e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg)) == GTK_RESPONSE_YES))
+	if (account && (account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS || account->receipt_policy == E_ACCOUNT_RECEIPT_ASK)
+	    && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg)) == GTK_RESPONSE_YES)
 		em_utils_send_receipt(folder, msg);
 }
 
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 59d0e13b27..0bc636486f 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -1,351 +1,344 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <error-list domain="mail">
 
- <error id="camel-service-auth-invalid" type="warning">
-  <_primary>Invalid authentication</_primary>
-  <_secondary xml:space="preserve">This server does not support this type of authentication and may not support authentication at all.</_secondary>
- </error>
-
- <error id="camel-service-auth-failed" type="warning">
-  <_primary>Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed.</_primary>
-  <_secondary xml:space="preserve">Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on.</_secondary>
- </error>
-
- <error id="ask-send-html" type="question" default="GTK_RESPONSE_YES">
-  <_primary>Are you sure you want to send a message in HTML format?</_primary>
-  <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
+  <error id="camel-service-auth-invalid" type="warning">
+    <_primary>Invalid authentication</_primary>
+    <_secondary xml:space="preserve">This server does not support this type of authentication and may not support authentication at all.</_secondary>
+  </error>
+
+  <error id="camel-service-auth-failed" type="warning">
+    <_primary>Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed.</_primary>
+    <_secondary xml:space="preserve">Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on.</_secondary>
+  </error>
+
+  <error id="ask-send-html" type="question" default="GTK_RESPONSE_YES">
+    <_primary>Are you sure you want to send a message in HTML format?</_primary>
+    <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
 {0}
 Send anyway?</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="_Send" response="GTK_RESPONSE_YES"/>
+  </error>
 
- <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
-  <_primary>Are you sure you want to send a message without a subject?</_primary>
-  <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
+  <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
+    <_primary>Are you sure you want to send a message without a subject?</_primary>
+    <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="_Send" response="GTK_RESPONSE_YES"/>
+  </error>
 
- <error id="ask-send-only-bcc-contact" type="question" default="GTK_RESPONSE_YES">
-  <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
-  <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
+  <error id="ask-send-only-bcc-contact" type="question" default="GTK_RESPONSE_YES">
+    <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
+    <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
 
 Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. </_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
-  <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
-  <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="send-no-recipients" type="warning">
-  <_primary>This message cannot be sent because you have not specified any recipients</_primary>
-  <_secondary xml:space="preserve">Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box.</_secondary>
- </error>
-
- <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
-  <_primary>Use default drafts folder?</_primary>
-  <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
-  <_primary>Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?</_primary>
-  <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Expunge" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
-  <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
-  <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
-  <_primary>Are you sure you want to open {0} messages at once?</_primary>
-  <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
-  <_primary>You have unsent messages, do you wish to quit anyway?</_primary>
-  <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="camel-exception" type="warning">
-  <_primary>Your message with the subject &quot;{0}&quot; was not delivered.</_primary>
-  <_secondary xml:space="preserve">The message was sent via the &quot;sendmail&quot; external application. Sendmail reports the following error: status 67: mail not sent.
-The message is stored in the Outbox folder. Check the message for errors and resend.</_secondary>
- </error>
-
- <error id="async-error" type="error">
-  <_primary>Error while {0}.</_primary>
-  <secondary>{1}</secondary>
- </error>
-
- <error id="async-error-nodescribe" type="error">
-  <_primary>Error while performing operation.</_primary>
-  <secondary>{0}</secondary>
- </error>
-
- <error id="session-message-info" type="info">
-  <secondary>{0}</secondary>
- </error>
-
- <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-  <secondary>{0}</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
- </error>
-
- <error id="session-message-warning" type="warning">
-  <secondary>{0}</secondary>
- </error>
-
- <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
-  <secondary>{0}</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
- </error>
-
- <error id="session-message-error" type="info">
-  <secondary>{0}</secondary>
- </error>
-
- <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-  <secondary>{0}</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
- </error>
-
- <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
-  <_primary>Enter password.</_primary>
-  <secondary>{0}</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
- </error>
-
- <error id="filter-load-error" type="error">
-  <_primary>Error loading filter definitions.</_primary>
-  <secondary>{0}</secondary>
- </error>
-
- <error id="no-save-path" type="error">
-  <_primary>Cannot save to directory &quot;{0}&quot;.</_primary>
-  <secondary>{1}</secondary>
- </error>
-
- <error id="no-create-path" type="error">
-  <_primary>Cannot save to file &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">Cannot create the save directory, because &quot;{1}&quot;</_secondary>
- </error>
-
- <error id="no-create-tmp-path" type="error">
-  <_primary>Cannot create temporary save directory.</_primary>
-  <_secondary xml:space="preserve">Because &quot;{1}&quot;.</_secondary>
- </error>
-
- <error id="no-write-path-exists" type="error">
-  <_primary>Cannot save to file &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">File exists but cannot overwrite it.</_secondary>
- </error>
-
- <error id="no-write-path-notfile" type="error">
-  <_primary>Cannot save to file &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">File exists but is not a regular file.</_secondary>
- </error>
-
- <error id="no-delete-folder" type="error">
-  <_primary>Cannot delete folder &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">Because &quot;{1}&quot;.</_secondary>
- </error>
-
- <error id="no-delete-special-folder" type="error">
-  <_primary>Cannot delete system folder &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
- </error>
-
- <error id="no-rename-special-folder" type="error">
-  <_primary>Cannot rename or move system folder &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
- </error>
-
- <error id="ask-delete-folder" type="question" default="GTK_RESPONSE_CANCEL">
-  <_title>Delete &quot;{0}&quot;?</_title>
-  <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
-  <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
- </error>
-
- <error id="ask-delete-vfolder" type="question" default="GTK_RESPONSE_CANCEL">
-  <_title>Delete &quot;{0}&quot;?</_title>
-  <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
- </error>
-
- <error id="no-rename-folder-exists" type="error">
-  <_primary>Cannot rename &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
-  <_secondary xml:space="preserve">A folder named &quot;{1}&quot; already exists. Please use a different name.</_secondary>
- </error>
-
- <error id="no-rename-folder" type="error">
-  <_primary>Cannot rename &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
-  <_secondary xml:space="preserve">Because &quot;{2}&quot;.</_secondary>
- </error>
-
- <error id="no-move-folder-nostore" type="error">
-  <_primary>Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
-  <_secondary xml:space="preserve">Cannot open source &quot;{2}&quot;.</_secondary>
- </error>
-
- <error id="no-move-folder-to-nostore" type="error">
-  <_primary>Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
-  <_secondary xml:space="preserve">Cannot open target &quot;{2}&quot;.</_secondary>
- </error>
-
- <error id="no-copy-folder-nostore" type="error">
-  <_primary>Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
-  <_secondary xml:space="preserve">Cannot open source &quot;{2}&quot;.</_secondary>
- </error>
-
- <error id="no-copy-folder-to-nostore" type="error">
-  <_primary>Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
-  <_secondary xml:space="preserve">Cannot open target &quot;{2}&quot;.</_secondary>
- </error>
-
- <error id="no-create-folder-nostore" type="error">
-  <_primary>Cannot create folder &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">Cannot open source &quot;{1}&quot;</_secondary>
- </error>
-
- <error id="account-incomplete" type="error">
-  <_primary>Cannot save changes to account.</_primary>
-  <_secondary xml:space="preserve">You have not filled in all of the required information.</_secondary>
- </error>
-
- <error id="account-notunique" type="error">
-  <_primary>Cannot save changes to account.</_primary>
-  <_secondary xml:space="preserve">You may not create two accounts with the same name.</_secondary>
- </error>
-
- <error id="ask-delete-account" type="question" default="GTK_RESPONSE_NO" modal="true">
-  <_title>Delete account?</_title>
-  <_primary>Are you sure you want to delete this account?</_primary>
-  <_secondary xml:space="preserve">If you proceed, the account information will be deleted permanently.</_secondary>
-  <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
-<error id="ask-delete-account-with-proxies" type="question" default="GTK_RESPONSE_NO" modal="true">
-  <_title>Delete account?</_title>
-  <_primary>Are you sure you want to delete this account and all its proxies?</_primary>
-  <_secondary xml:space="preserve">If you proceed, the account information and
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="_Send" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
+    <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
+    <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="_Send" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="send-no-recipients" type="warning">
+    <_primary>This message cannot be sent because you have not specified any recipients</_primary>
+    <_secondary xml:space="preserve">Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box.</_secondary>
+  </error>
+
+  <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
+    <_primary>Use default drafts folder?</_primary>
+    <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
+    <_primary>Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?</_primary>
+    <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="_Expunge" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
+    <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
+    <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
+    <_primary>Are you sure you want to open {0} messages at once?</_primary>
+    <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
+    <_primary>You have unsent messages, do you wish to quit anyway?</_primary>
+    <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+    <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="async-error" type="error">
+    <_primary>Error while {0}.</_primary>
+    <secondary>{1}</secondary>
+  </error>
+
+  <error id="async-error-nodescribe" type="error">
+    <_primary>Error while performing operation.</_primary>
+    <secondary>{0}</secondary>
+  </error>
+
+  <error id="session-message-info" type="info">
+    <secondary>{0}</secondary>
+  </error>
+
+  <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
+    <secondary>{0}</secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+  </error>
+
+  <error id="session-message-warning" type="warning">
+    <secondary>{0}</secondary>
+  </error>
+
+  <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
+    <secondary>{0}</secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+  </error>
+
+  <error id="session-message-error" type="info">
+    <secondary>{0}</secondary>
+  </error>
+
+  <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
+    <secondary>{0}</secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+  </error>
+
+  <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
+    <_primary>Enter password.</_primary>
+    <secondary>{0}</secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+  </error>
+
+  <error id="filter-load-error" type="error">
+    <_primary>Error loading filter definitions.</_primary>
+    <secondary>{0}</secondary>
+  </error>
+
+  <error id="no-save-path" type="error">
+    <_primary>Cannot save to directory &quot;{0}&quot;.</_primary>
+    <secondary>{1}</secondary>
+  </error>
+
+  <error id="no-create-path" type="error">
+    <_primary>Cannot save to file &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">Cannot create the save directory, because &quot;{1}&quot;</_secondary>
+  </error>
+
+  <error id="no-create-tmp-path" type="error">
+    <_primary>Cannot create temporary save directory.</_primary>
+    <_secondary xml:space="preserve">Because &quot;{1}&quot;.</_secondary>
+  </error>
+
+  <error id="no-write-path-exists" type="error">
+    <_primary>Cannot save to file &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">File exists but cannot overwrite it.</_secondary>
+  </error>
+
+  <error id="no-write-path-notfile" type="error">
+    <_primary>Cannot save to file &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">File exists but is not a regular file.</_secondary>
+  </error>
+
+  <error id="no-delete-folder" type="error">
+    <_primary>Cannot delete folder &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">Because &quot;{1}&quot;.</_secondary>
+  </error>
+
+  <error id="no-delete-special-folder" type="error">
+    <_primary>Cannot delete system folder &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
+  </error>
+
+  <error id="no-rename-special-folder" type="error">
+    <_primary>Cannot rename or move system folder &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
+  </error>
+
+  <error id="ask-delete-folder" type="question" default="GTK_RESPONSE_CANCEL">
+    <_title>Delete &quot;{0}&quot;?</_title>
+    <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
+    <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
+  </error>
+
+  <error id="ask-delete-vfolder" type="question" default="GTK_RESPONSE_CANCEL">
+    <_title>Delete &quot;{0}&quot;?</_title>
+    <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
+  </error>
+
+  <error id="no-rename-folder-exists" type="error">
+    <_primary>Cannot rename &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
+    <_secondary xml:space="preserve">A folder named &quot;{1}&quot; already exists. Please use a different name.</_secondary>
+  </error>
+
+  <error id="no-rename-folder" type="error">
+    <_primary>Cannot rename &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
+    <_secondary xml:space="preserve">Because &quot;{2}&quot;.</_secondary>
+  </error>
+
+  <error id="no-move-folder-nostore" type="error">
+    <_primary>Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
+    <_secondary xml:space="preserve">Cannot open source &quot;{2}&quot;.</_secondary>
+  </error>
+
+  <error id="no-move-folder-to-nostore" type="error">
+    <_primary>Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
+    <_secondary xml:space="preserve">Cannot open target &quot;{2}&quot;.</_secondary>
+  </error>
+
+  <error id="no-copy-folder-nostore" type="error">
+    <_primary>Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
+    <_secondary xml:space="preserve">Cannot open source &quot;{2}&quot;.</_secondary>
+  </error>
+
+  <error id="no-copy-folder-to-nostore" type="error">
+    <_primary>Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;.</_primary>
+    <_secondary xml:space="preserve">Cannot open target &quot;{2}&quot;.</_secondary>
+  </error>
+
+  <error id="no-create-folder-nostore" type="error">
+    <_primary>Cannot create folder &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">Cannot open source &quot;{1}&quot;</_secondary>
+  </error>
+
+  <error id="account-incomplete" type="error">
+    <_primary>Cannot save changes to account.</_primary>
+    <_secondary xml:space="preserve">You have not filled in all of the required information.</_secondary>
+  </error>
+
+  <error id="account-notunique" type="error">
+    <_primary>Cannot save changes to account.</_primary>
+    <_secondary xml:space="preserve">You may not create two accounts with the same name.</_secondary>
+  </error>
+
+  <error id="ask-delete-account" type="question" default="GTK_RESPONSE_NO" modal="true">
+    <_title>Delete account?</_title>
+    <_primary>Are you sure you want to delete this account?</_primary>
+    <_secondary xml:space="preserve">If you proceed, the account information will be deleted permanently.</_secondary>
+    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+    <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
+  </error>
+
+  <error id="ask-delete-account-with-proxies" type="question" default="GTK_RESPONSE_NO" modal="true">
+    <_title>Delete account?</_title>
+    <_primary>Are you sure you want to delete this account and all its proxies?</_primary>
+    <_secondary xml:space="preserve">If you proceed, the account information and
 all proxy information will be deleted permanently.</_secondary>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-  <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
- </error>
-
-<error id="ask-delete-proxy-accounts" type="question" default="GTK_RESPONSE_NO" modal="true">
-  <_title>Delete account?</_title>
-  <_primary>Are you sure you want to disable this account and delete all its proxies?</_primary>
-  <_secondary xml:space="preserve">If you proceed, all proxy accounts will be deleted permanently.</_secondary>
-  <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
-  <button stock="gtk-no" _label="Do not disable" response="GTK_RESPONSE_NO"/>
- </error>
-
- <error id="no-save-signature" type="error">
-  <_primary>Could not save signature file.</_primary>
-  <_secondary xml:space="preserve">Because &quot;{0}&quot;.</_secondary>
- </error>
-
- <error id="signature-notscript" type="error">
-  <_primary>Cannot set signature script &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">The script file must exist and be executable.</_secondary>
- </error>
-
- <error id="ask-signature-changed" type="question" default="GTK_RESPONSE_YES">
-  <_title>Discard changes?</_title>
-  <_primary>Do you wish to save your changes?</_primary>
-  <_secondary xml:space="preserve">This signature has been changed, but has not been saved.</_secondary>
-  <button _label="_Discard changes" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="vfolder-notexist" type="error">
-  <_primary>Cannot edit Search Folder &quot;{0}&quot; as it does not exist.</_primary>
-  <_secondary xml:space="preserve">This folder may have been added implicitly,
+    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+    <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
+  </error>
+
+  <error id="ask-delete-proxy-accounts" type="question" default="GTK_RESPONSE_NO" modal="true">
+    <_title>Delete account?</_title>
+    <_primary>Are you sure you want to disable this account and delete all its proxies?</_primary>
+    <_secondary xml:space="preserve">If you proceed, all proxy accounts will be deleted permanently.</_secondary>
+    <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
+    <button stock="gtk-no" _label="Do not disable" response="GTK_RESPONSE_NO"/>
+  </error>
+
+  <error id="no-save-signature" type="error">
+    <_primary>Could not save signature file.</_primary>
+    <_secondary xml:space="preserve">Because &quot;{0}&quot;.</_secondary>
+  </error>
+
+  <error id="signature-notscript" type="error">
+    <_primary>Cannot set signature script &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">The script file must exist and be executable.</_secondary>
+  </error>
+
+  <error id="ask-signature-changed" type="question" default="GTK_RESPONSE_YES">
+    <_title>Discard changes?</_title>
+    <_primary>Do you wish to save your changes?</_primary>
+    <_secondary xml:space="preserve">This signature has been changed, but has not been saved.</_secondary>
+    <button _label="_Discard changes" response="GTK_RESPONSE_NO"/>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
+  </error>
+
+  <error id="vfolder-notexist" type="error">
+    <_primary>Cannot edit Search Folder &quot;{0}&quot; as it does not exist.</_primary>
+    <_secondary xml:space="preserve">This folder may have been added implicitly,
 go to the Search Folder editor to add it explicitly, if required.</_secondary>
- </error>
+  </error>
 
- <error id="vfolder-notunique" type="error">
-  <_primary>Cannot add Search Folder &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">A folder named &quot;{1}&quot; already exists. Please use a different name.</_secondary>
- </error>
+  <error id="vfolder-notunique" type="error">
+    <_primary>Cannot add Search Folder &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">A folder named &quot;{1}&quot; already exists. Please use a different name.</_secondary>
+  </error>
 
- <error id="vfolder-updated" type="info">
-  <_primary>Search Folders automatically updated.</_primary>
-  <_secondary xml:space="preserve">The following Search Folder(s):
+  <error id="vfolder-updated" type="info">
+    <_primary>Search Folders automatically updated.</_primary>
+    <_secondary xml:space="preserve">The following Search Folder(s):
 {0}
 Used the now removed folder:
     &quot;{1}&quot;
 And have been updated.</_secondary>
- </error>
+  </error>
 
- <error id="filter-updated" type="info">
-  <_primary>Mail filters automatically updated.</_primary>
-  <_secondary xml:space="preserve">The following filter rule(s):
+  <error id="filter-updated" type="info">
+    <_primary>Mail filters automatically updated.</_primary>
+    <_secondary xml:space="preserve">The following filter rule(s):
 {0}
 Used the now removed folder:
     &quot;{1}&quot;
 And have been updated.</_secondary>
- </error>
+  </error>
 
- <error id="no-folder" type="error">
-  <_primary>Missing folder.</_primary>
-  <_secondary xml:space="preserve">You must specify a folder.</_secondary>
- </error>
+  <error id="no-folder" type="error">
+    <_primary>Missing folder.</_primary>
+    <_secondary xml:space="preserve">You must specify a folder.</_secondary>
+  </error>
 
- <error id="no-name-vfolder" type="error">
-  <_primary>Missing name.</_primary>
-  <_secondary xml:space="preserve">You must name this Search Folder.</_secondary>
- </error>
+  <error id="no-name-vfolder" type="error">
+    <_primary>Missing name.</_primary>
+    <_secondary xml:space="preserve">You must name this Search Folder.</_secondary>
+  </error>
 
- <error id="vfolder-no-source" type="error">
-  <_primary>No sources selected.</_primary>
-  <_secondary xml:space="preserve">You must specify at least one folder as a source.
+  <error id="vfolder-no-source" type="error">
+    <_primary>No sources selected.</_primary>
+    <_secondary xml:space="preserve">You must specify at least one folder as a source.
 Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both.</_secondary>
- </error>
+  </error>
 
- <error id="ask-migrate-existing" type="question" default="GTK_RESPONSE_CANCEL">
-  <_primary>Problem migrating old mail folder &quot;{0}&quot;.</_primary>
-  <_secondary xml:space="preserve">A non-empty folder at &quot;{1}&quot; already exists.
+  <error id="ask-migrate-existing" type="question" default="GTK_RESPONSE_CANCEL">
+    <_primary>Problem migrating old mail folder &quot;{0}&quot;.</_primary>
+    <_secondary xml:space="preserve">A non-empty folder at &quot;{1}&quot; already exists.
 
-You can choose to ignore this folder, overwrite or append its contents, or quit.
-</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="Ignore" response="GTK_RESPONSE_REJECT"/>
-  <button stock="gtk-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
-  <button _label="_Append" response="GTK_RESPONSE_OK"/>
- </error>
+You can choose to ignore this folder, overwrite or append its contents, or quit.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="Ignore" response="GTK_RESPONSE_REJECT"/>
+    <button stock="gtk-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
+    <button _label="_Append" response="GTK_RESPONSE_OK"/>
+  </error>
 
- <error id="no-load-license" type="error">
-  <_primary>Unable to read license file.</_primary>
-  <_secondary xml:space="preserve">Cannot read the license file &quot;{0}&quot;, due to an installation problem. You will not be able to use this provider until you can accept its license.</_secondary>
- </error>
+  <error id="no-load-license" type="error">
+    <_primary>Unable to read license file.</_primary>
+    <_secondary xml:space="preserve">Cannot read the license file &quot;{0}&quot;, due to an installation problem. You will not be able to use this provider until you can accept its license.</_secondary>
+  </error>
 
   <error id="checking-service" type="info">
     <_title>Querying server</_title>
@@ -354,10 +347,10 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
     <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   </error>
 
- <error id="gw-accountsetup-error" type="error">
- <_primary>Unable to connect to the GroupWise server.</_primary>
-<_secondary xml:space="preserve">Please check your account settings and try again.</_secondary>
-</error>
+  <error id="gw-accountsetup-error" type="error">
+    <_primary>Unable to connect to the GroupWise server.</_primary>
+    <_secondary xml:space="preserve">Please check your account settings and try again.</_secondary>
+  </error>
 
   <error id="ask-receipt" type="question" default="GTK_RESPONSE_NO">
     <_title>Read receipt requested.</_title>
@@ -376,7 +369,7 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
     <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
   </error>
 
-   <error id="ask-mark-all-read" type="question" default="GTK_RESPONSE_NO">
+  <error id="ask-mark-all-read" type="question" default="GTK_RESPONSE_NO">
     <_title>Mark all messages as read</_title>
     <_primary>Do you want to mark all messages as read?</_primary>
     <_secondary xml:space="preserve">This will mark all messages as read in the selected folder and its subfolders.</_secondary>
@@ -385,19 +378,19 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
   </error>
 
   <error id="signature-already-exists" type="error" modal="true">
-  	<_primary>Signature Already Exists</_primary>
-	<_secondary>A signature already exists with the name &quot;{0}&quot;. Please specify a different name. </_secondary>
+    <_primary>Signature Already Exists</_primary>
+    <_secondary>A signature already exists with the name &quot;{0}&quot;. Please specify a different name. </_secondary>
   </error>
   
   <error id="blank-signature" type="error" modal="true">
-  	<_primary>Blank Signature</_primary>
-	<_secondary>Please provide an unique name to identify this signature.</_secondary>
+    <_primary>Blank Signature</_primary>
+    <_secondary>Please provide an unique name to identify this signature.</_secondary>
   </error>
   
   <error id="send-no-account-enabled" type="warning">
-  <_primary>This message cannot be sent because the account you chose to send with is not enabled</_primary>
-  <_secondary xml:space="preserve">Please enable the account or send using another account.</_secondary>
- </error>
+    <_primary>This message cannot be sent because the account you chose to send with is not enabled</_primary>
+    <_secondary xml:space="preserve">Please enable the account or send using another account.</_secondary>
+  </error>
 
 </error-list>