Bug 1366591, Bug 28211 - When save to Sent (or Drafts or Templates) fails, save to subfolder of local folders. r=jorgk,aceman
authorGene Smith <gds@chartertn.net>
Mon, 10 Jul 2017 02:17:02 -0400
changeset 8791 8a0c7cc6c439cd4e3728cff98959045bb6429837
parent 8790 01a5cacf34935f23e8c198c15555fb60840ce3d2
child 8792 9813f19221c4fd2cbca9ea8a73068f3577f9cba8
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersjorgk, aceman
bugs1366591, 28211
Bug 1366591, Bug 28211 - When save to Sent (or Drafts or Templates) fails, save to subfolder of local folders. r=jorgk,aceman When save to Sent, Drafts or Templates folders fails, e.g., due to IMAP connection issues, prompts now occurs to save to <local folder account>/Sent-<account>, <local folder account>/Drafts-<account> or <local folder account>/Templates-<account>, where <account> is the account name having the network issue. Also supports sending by right-click on Outbox after messages composed and saved with "Send Later". X-Channel-Repo: comm-central X-Channel-Converted-Revision: a6a1279292d055c75b9554b01dab78b1cd9f27de
mail/chrome/messenger/messengercompose/composeMsgs.properties
suite/chrome/mailnews/compose/composeMsgs.properties
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -108,18 +108,20 @@ smtpAuthMechNotSupported=The Outgoing se
 smtpAuthenticationNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in the 'Account Settings | Outgoing Server (SMTP)' or contact your email service provider for instructions.
 
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=There are non-ASCII characters in the local part of the recipient address %s. This is not yet supported. Please change this address and try again.
 
 ## Strings used for the save message dialog shown when the user closes a message compose window
 saveDlogTitle=Save Message
 
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
-saveDlogMessages=Message has not been sent. Do you want to save the message in your drafts folder (%1$S)?
+## LOCALIZATION NOTE (saveDlogMessages2): Do not translate the words %1$S and \n.
+## %1$S is replaced by the folder name configured for saving drafts (typically the "Drafts" folder).
+## Translate "Write" to match the translation of item "windowTitlePrefix" below.
+saveDlogMessages2=Message has not been sent or saved in your drafts folder (%1$S).\n"Save" copies the message to your drafts folder (%1$S) and closes the Write window.\n"Don't Save" closes the Write window without saving a draft.\n"Cancel" allows you continue writing without saving a draft.
 
 ## generics string
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
 genericFailureExplanation=Please verify that your account settings are correct and try again.
 
 ## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
 undisclosedRecipients=undisclosed-recipients
@@ -326,22 +328,44 @@ smtpEnterPasswordPrompt=Enter your passw
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
 smtpEnterPasswordPromptTitle=Outgoing server (SMTP) Password Required
 
 # LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 removeAttachmentMsgs=Remove Attachment;Remove Attachments
 
-## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
-## will be replaced with the name of the folder the message is being saved to.
-errorSavingMsg=There was an error saving the message to %S. Retry?
+## LOCALIZATION NOTE(promptToSaveSentLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved sent messages (typically the "Sent" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+## Translate "Write" to match the translation of item "windowTitlePrefix" above.
+promptToSaveSentLocally=Your message was sent but not saved to your sent folder (%1$S) probably because of network errors.\n"Retry" attempts the save again.\n"Save" copies the message to %3$S/%1$S-%2$S and closes the Write window if it is present.\n"Cancel" does not save the sent message and closes the Write window if it is present.
 errorFilteringMsg=Your message has been sent and saved, but there was an error while running message filters on it.
 errorCloudFileAuth.title=Authentication Error
 
+## LOCALIZATION NOTE(promptToSaveDraftLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved draft messages (typically the "Drafts" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+promptToSaveDraftLocally=Your draft message was not saved to your drafts folder (%1$S) probably because of network errors.\n"Retry" attempts to save again.\n"Save" copies the message to %3$S/%1$S-%2$S and you can continue writing.\n"Cancel" allows you to continue writing without saving your draft.
+buttonLabelRetry=Retry
+
+## LOCALIZATION NOTE(promptToSaveTemplateLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved templates (typically the "Templates" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+promptToSaveTemplateLocally=Your template was not saved to your templates folder (%1$S) probably because of network errors.\n"Retry" attempts to save again.\n"Save" copies the message to %3$S/%1$S-%2$S and you can continue writing.\n"Cancel" allows you to continue writing without saving your template.
+
+## LOCALIZATION NOTE(saveToLocalFoldersFailed): Message appears after normal
+## save fails (e.g., to Sent) and save to Local Folders also fails. This could
+## occur if network is down and filesystem problems are present such as disk
+## full, permission issues or hardware failure.
+saveToLocalFoldersFailed=Unable to save your message to local folders. Possibly out of file storage space.
+
 ## LOCALIZATION NOTE(errorCloudFileAuth.message):
 ## %1$S is the name of the online storage service against which the authentication failed.
 errorCloudFileAuth.message=Unable to authenticate to %1$S.
 errorCloudFileUpload.title=Upload Error
 
 ## LOCALIZATION NOTE(errorCloudFileUpload.message):
 ## %1$S is the name of the online storage service against which the uploading failed.
 ## %2$S is the name of the file that failed to upload.
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -107,18 +107,21 @@ smtpAuthMechNotSupported=The Outgoing se
 # LOCALIZATION NOTE (smtpAuthenticationNotSupported): %S is the server hostname
 smtpAuthenticationNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in 'Account Settings | Outgoing server (SMTP)' or contact your email service provider for instructions.
 
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=There are non-ASCII characters in the local part of the recipient address %s. This is not yet supported. Please change this address and try again.
 
 ## Strings used for the save message dialog shown when the user closes a message compose window
 saveDlogTitle=Save Message
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
-saveDlogMessages=Message has not been sent. Do you want to save the message in your drafts folder (%1$S)?
+
+## LOCALIZATION NOTE (saveDlogMessages2): Do not translate the words %1$S and \n.
+## %1$S is replaced by the folder name configured for saving drafts (typically the "Drafts" folder).
+## Translate "Compose" to match the translation of item "windowTitlePrefix" below.
+saveDlogMessages2=Message has not been sent or saved in your drafts folder (%1$S).\n"Save" copies the message to your drafts folder (%1$S) and closes the Compose window.\n"Don't Save" closes the Compose window without saving a draft.\n"Cancel" allows you continue writing without saving a draft.
 
 ## generics string
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
 
 ##
 windowTitlePrefix=Compose:
 
@@ -233,12 +236,34 @@ renameAttachmentMessage=New attachment n
 smtpEnterPasswordPrompt=Enter your password for %S:
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
 smtpEnterPasswordPromptTitle=Outgoing server (SMTP) Server Password Required
 
-## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
-## will be replaced with the name of the folder the message is being saved to.
-errorSavingMsg=There was an error saving the message to %S. Retry?
+## LOCALIZATION NOTE(promptToSaveSentLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved sent messages (typically the "Sent" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+## Translate "Compose" to match the translation of item "windowTitlePrefix" above.
+promptToSaveSentLocally=Your message was sent but not saved to your sent folder (%1$S) probably because of network errors.\n"Retry" attempts the save again.\n"Save" copies the message to %3$S/%1$S-%2$S and closes the Compose window if it is present.\n"Cancel" does not save the sent message and closes the Compose window if it is present.
 errorFilteringMsg=Your message has been sent and saved, but there was an error while running message filters on it.
+
+## LOCALIZATION NOTE(promptToSaveDraftLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved draft messages (typically the "Drafts" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+promptToSaveDraftLocally=Your draft message was not saved to your drafts folder (%1$S) probably because of network errors.\n"Retry" attempts to save again.\n"Save" copies the message to %3$S/%1$S-%2$S and you can continue writing.\n"Cancel" allows you to continue writing without saving your draft.
+buttonLabelRetry=Retry
+
+## LOCALIZATION NOTE(promptToSaveTemplateLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved templates (typically the "Templates" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+promptToSaveTemplateLocally=Your template was not saved to your templates folder (%1$S) probably because of network errors.\n"Retry" attempts to save again.\n"Save" copies the message to %3$S/%1$S-%2$S and you can continue writing.\n"Cancel" allows you to continue writing without saving your template.
+
+## LOCALIZATION NOTE(saveToLocalFoldersFailed): Message appears after normal
+## save fails (e.g., to Sent) and save to Local Folders also fails. This could
+## occur if network is down and filesystem problems are present such as disk
+## full, permission issues or hardware failure.
+saveToLocalFoldersFailed=Unable to save your message to local folders. Possibly out of file storage space.