aboutsummaryrefslogtreecommitdiffstats
path: root/composer/mail-composer.error.xml
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-10-31 08:56:51 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-31 09:01:11 +0800
commit6709cd6e5879adf9505bf25306b34932ceb6b5a6 (patch)
tree312df0503efeb1df8150cad3b0ff2f1032fd7420 /composer/mail-composer.error.xml
parentcc01e6c845b27598bc6071cdf86fc9e86b775b09 (diff)
downloadgsoc2013-evolution-6709cd6e5879adf9505bf25306b34932ceb6b5a6.tar.gz
gsoc2013-evolution-6709cd6e5879adf9505bf25306b34932ceb6b5a6.tar.zst
gsoc2013-evolution-6709cd6e5879adf9505bf25306b34932ceb6b5a6.zip
Skip writing to Outbox when sending.
When sending a message from a composer window, it seems pointless to write message to Outbox only to immediately read it back and mark it for deletion. Instead, bypass the Outbox folder when sending, and if an error occurs, offer to save the message to Outbox instead.
Diffstat (limited to 'composer/mail-composer.error.xml')
-rw-r--r--composer/mail-composer.error.xml14
1 files changed, 9 insertions, 5 deletions
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 90f0187b0e..e265aaad02 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -63,19 +63,23 @@
<_secondary>The reported error was &quot;{0}&quot;. The message has not been sent.</_secondary>
</error>
- <error id="save-draft-error" type="error">
+ <error id="save-to-drafts-error" type="error">
<_primary>An error occurred while saving to your Drafts folder.</_primary>
<_secondary>The reported error was &quot;{0}&quot;. The message has most likely not been saved.</_secondary>
</error>
<error id="send-error" type="error">
- <_primary>An error occurred while sending.</_primary>
+ <_primary>An error occurred while sending. How do you want to proceed?</_primary>
<_secondary>The reported error was &quot;{0}&quot;.</_secondary>
+ <!-- Response codes were chosen somewhat arbitrarily. -->
+ <button _label="_Continue Editing" response="GTK_RESPONSE_CLOSE"/>
+ <button _label="_Save to Outbox" response="GTK_RESPONSE_ACCEPT"/>
+ <button _label="_Try Again" response="GTK_RESPONSE_OK"/>
</error>
- <error id="saved-to-outbox" type="info">
- <_primary>Message saved to Outbox.</_primary>
- <_secondary>Because you are working offline, the message has been saved to your local Outbox folder. When you are back online you can send the message by clicking the Send/Receive button in Evolution's toolbar.</_secondary>
+ <error id="saving-to-outbox" type="info">
+ <_primary>Saving message to Outbox.</_primary>
+ <_secondary>Because you are working offline, the message will be saved to your local Outbox folder. When you are back online you can send the message by clicking the Send/Receive button in Evolution's toolbar.</_secondary>
</error>
</error-list>