Bug 1414022 - fix wording of 'save message' and related dialogs. r=jorgk, ui-r=Paenglab
This commit is contained in:
Gene Smith
Родитель
a320d5b7f4
Коммит
63ff3c6eb8
|
|
@ -4242,11 +4242,13 @@ function ComposeCanClose()
|
|||
let result = Services.prompt
|
||||
.confirmEx(window,
|
||||
getComposeBundle().getString("saveDlogTitle"),
|
||||
getComposeBundle().getFormattedString("saveDlogMessages2", [draftFolderName]),
|
||||
getComposeBundle().getFormattedString("saveDlogMessages3", [draftFolderName]),
|
||||
(Services.prompt.BUTTON_TITLE_SAVE * Services.prompt.BUTTON_POS_0) +
|
||||
(Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1) +
|
||||
(Services.prompt.BUTTON_TITLE_DONT_SAVE * Services.prompt.BUTTON_POS_2),
|
||||
null, null, null,
|
||||
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_2),
|
||||
null,
|
||||
null,
|
||||
getComposeBundle().getString("discardButtonLabel"),
|
||||
null, {value:0});
|
||||
switch (result)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -113,10 +113,11 @@ errorIllegalLocalPart=There are non-ASCII characters in the local part of the re
|
|||
## Strings used for the save message dialog shown when the user closes a message compose window
|
||||
saveDlogTitle=Save Message
|
||||
|
||||
## LOCALIZATION NOTE (saveDlogMessages2): Do not translate the words %1$S and \n.
|
||||
## LOCALIZATION NOTE (saveDlogMessages3): 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.
|
||||
## Translate "Write" to match the translation of item "windowTitleWrite" below.
|
||||
saveDlogMessages3=Save this message to your drafts folder (%1$S) and close the Write window?
|
||||
discardButtonLabel=&Discard changes
|
||||
|
||||
## generics string
|
||||
defaultSubject=(no subject)
|
||||
|
|
@ -344,27 +345,27 @@ smtpEnterPasswordPromptTitle=Outgoing server (SMTP) Password Required
|
|||
# See: http://developer.mozilla.org/en/Localization_and_Plurals
|
||||
removeAttachmentMsgs=Remove Attachment;Remove Attachments
|
||||
|
||||
## LOCALIZATION NOTE(promptToSaveSentLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
|
||||
## LOCALIZATION NOTE(promptToSaveSentLocally2): 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.
|
||||
## Translate "Write" to match the translation of item "windowTitleWrite" above.
|
||||
promptToSaveSentLocally2=Your message was sent but a copy was not placed in your sent folder (%1$S) due to network or file access errors.\nYou can retry or save the message locally to %3$S/%1$S-%2$S.
|
||||
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.
|
||||
## LOCALIZATION NOTE(promptToSaveDraftLocally2): 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
|
||||
promptToSaveDraftLocally2=Your draft message was not copied to your drafts folder (%1$S) due to network or file access errors.\nYou can retry or save the draft locally to %3$S/%1$S-%2$S.
|
||||
buttonLabelRetry2=&Retry
|
||||
|
||||
## LOCALIZATION NOTE(promptToSaveTemplateLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
|
||||
## LOCALIZATION NOTE(promptToSaveTemplateLocally2): 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.
|
||||
promptToSaveTemplateLocally2=Your template was not copied to your templates folder (%1$S) due to network or file access errors.\nYou can retry or save the template locally to %3$S/%1$S-%2$S.
|
||||
|
||||
## LOCALIZATION NOTE(saveToLocalFoldersFailed): Message appears after normal
|
||||
## save fails (e.g., to Sent) and save to Local Folders also fails. This could
|
||||
|
|
|
|||
|
|
@ -3890,17 +3890,17 @@ nsMsgComposeAndSend::NotifyListenerOnStopCopy(nsresult aStatus)
|
|||
{
|
||||
case nsMsgDeliverNow:
|
||||
case nsMsgSendUnsent:
|
||||
rv = bundle->FormatStringFromName("promptToSaveSentLocally",
|
||||
rv = bundle->FormatStringFromName("promptToSaveSentLocally2",
|
||||
formatStrings, 3,
|
||||
msg);
|
||||
break;
|
||||
case nsMsgSaveAsDraft:
|
||||
rv = bundle->FormatStringFromName("promptToSaveDraftLocally",
|
||||
rv = bundle->FormatStringFromName("promptToSaveDraftLocally2",
|
||||
formatStrings, 3,
|
||||
msg);
|
||||
break;
|
||||
case nsMsgSaveAsTemplate:
|
||||
rv = bundle->FormatStringFromName("promptToSaveTemplateLocally",
|
||||
rv = bundle->FormatStringFromName("promptToSaveTemplateLocally2",
|
||||
formatStrings, 3,
|
||||
msg);
|
||||
break;
|
||||
|
|
@ -3911,11 +3911,11 @@ nsMsgComposeAndSend::NotifyListenerOnStopCopy(nsresult aStatus)
|
|||
int32_t buttonPressed = 0;
|
||||
bool showCheckBox = false;
|
||||
uint32_t buttonFlags = (nsIPrompt::BUTTON_POS_0 * nsIPrompt::BUTTON_TITLE_IS_STRING) +
|
||||
(nsIPrompt::BUTTON_POS_1 * nsIPrompt::BUTTON_TITLE_CANCEL) +
|
||||
(nsIPrompt::BUTTON_POS_1 * nsIPrompt::BUTTON_TITLE_DONT_SAVE) +
|
||||
(nsIPrompt::BUTTON_POS_2 * nsIPrompt::BUTTON_TITLE_SAVE);
|
||||
nsString dialogTitle, buttonLabelRetry;
|
||||
bundle->GetStringFromName("SaveDialogTitle", dialogTitle);
|
||||
bundle->GetStringFromName("buttonLabelRetry", buttonLabelRetry);
|
||||
bundle->GetStringFromName("buttonLabelRetry2", buttonLabelRetry);
|
||||
prompt->ConfirmEx(dialogTitle.get(), msg.get(), buttonFlags, buttonLabelRetry.get(),
|
||||
nullptr, nullptr, nullptr, &showCheckBox, &buttonPressed);
|
||||
if (buttonPressed == 0)
|
||||
|
|
|
|||
|
|
@ -113,10 +113,11 @@ errorIllegalLocalPart=There are non-ASCII characters in the local part of the re
|
|||
## Strings used for the save message dialog shown when the user closes a message compose window
|
||||
saveDlogTitle=Save Message
|
||||
|
||||
## LOCALIZATION NOTE (saveDlogMessages2): Do not translate the words %1$S and \n.
|
||||
## LOCALIZATION NOTE (saveDlogMessages3): 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.
|
||||
saveDlogMessages3=Save this message to your drafts folder (%1$S) and close the Compose window?
|
||||
discardButtonLabel=&Discard changes
|
||||
|
||||
## generics string
|
||||
defaultSubject=(no subject)
|
||||
|
|
@ -241,26 +242,25 @@ smtpEnterPasswordPrompt=Enter your password for %S:
|
|||
smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
|
||||
smtpEnterPasswordPromptTitle=Outgoing server (SMTP) Server Password Required
|
||||
|
||||
## LOCALIZATION NOTE(promptToSaveSentLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
|
||||
## LOCALIZATION NOTE(promptToSaveSentLocally2): 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.
|
||||
promptToSaveSentLocally2=Your message was sent but a copy was not placed in your sent folder (%1$S) due to network or file access errors.\nYou can retry or save the message locally to %3$S/%1$S-%2$S.
|
||||
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.
|
||||
## LOCALIZATION NOTE(promptToSaveDraftLocally2): 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
|
||||
promptToSaveDraftLocally2=Your draft message was not copied to your drafts folder (%1$S) due to network or file access errors.\nYou can retry or save the draft locally to %3$S/%1$S-%2$S.
|
||||
buttonLabelRetry2=&Retry
|
||||
|
||||
## LOCALIZATION NOTE(promptToSaveTemplateLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
|
||||
## LOCALIZATION NOTE(promptToSaveTemplateLocally2): 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.
|
||||
promptToSaveTemplateLocally2=Your template was not copied to your templates folder (%1$S) due to network or file access errors.\nYou can retry or save the template locally to %3$S/%1$S-%2$S.
|
||||
|
||||
## LOCALIZATION NOTE(saveToLocalFoldersFailed): Message appears after normal
|
||||
## save fails (e.g., to Sent) and save to Local Folders also fails. This could
|
||||
|
|
|
|||
|
|
@ -2321,11 +2321,14 @@ function ComposeCanClose()
|
|||
let draftFolderName = MailUtils.getFolderForURI(draftFolderURI).prettyName;
|
||||
switch (Services.prompt.confirmEx(window,
|
||||
sComposeMsgsBundle.getString("saveDlogTitle"),
|
||||
sComposeMsgsBundle.getFormattedString("saveDlogMessages2", [draftFolderName]),
|
||||
sComposeMsgsBundle.getFormattedString("saveDlogMessages3", [draftFolderName]),
|
||||
(Services.prompt.BUTTON_TITLE_SAVE * Services.prompt.BUTTON_POS_0) +
|
||||
(Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1) +
|
||||
(Services.prompt.BUTTON_TITLE_DONT_SAVE * Services.prompt.BUTTON_POS_2),
|
||||
null, null, null, null, {value:0}))
|
||||
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_2),
|
||||
null,
|
||||
null,
|
||||
getComposeBundle().getString("discardButtonLabel"),
|
||||
null, {value:0}))
|
||||
{
|
||||
case 0: //Save
|
||||
// we can close immediately if we already autosaved the draft
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче