Bug 1115717 - Warning dialog when exiting Private Browsing with active downloads could be made less technical. r=paolo

This commit is contained in:
Jared Wein 2015-01-15 16:04:34 -05:00
parent b30696300e
commit 48ac6294ec
3 changed files with 10 additions and 11 deletions

View File

@ -2524,9 +2524,9 @@ nsDownloadManager::Observe(nsISupports *aSubject,
ConfirmCancelDownloads(mCurrentPrivateDownloads.Count(), cancelDownloads,
MOZ_UTF16("leavePrivateBrowsingCancelDownloadsAlertTitle"),
MOZ_UTF16("leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple"),
MOZ_UTF16("leavePrivateBrowsingWindowsCancelDownloadsAlertMsg"),
MOZ_UTF16("dontLeavePrivateBrowsingButton"));
MOZ_UTF16("leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2"),
MOZ_UTF16("leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2"),
MOZ_UTF16("dontLeavePrivateBrowsingButton2"));
}
return NS_OK;

View File

@ -40,7 +40,7 @@ const kStringsRequiringFormatting = {
quitCancelDownloadsAlertMsgMultiple: true,
quitCancelDownloadsAlertMsgMacMultiple: true,
offlineCancelDownloadsAlertMsgMultiple: true,
leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple: true
leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2: true
};
////////////////////////////////////////////////////////////////////////////////
@ -232,9 +232,9 @@ this.DownloadPrompter.prototype = {
case this.ON_LEAVE_PRIVATE_BROWSING:
title = s.leavePrivateBrowsingCancelDownloadsAlertTitle;
message = aDownloadsCount > 1
? s.leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple(aDownloadsCount)
: s.leavePrivateBrowsingWindowsCancelDownloadsAlertMsg;
cancelButton = s.dontLeavePrivateBrowsingButton;
? s.leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2(aDownloadsCount)
: s.leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2;
cancelButton = s.dontLeavePrivateBrowsingButton2;
break;
}

View File

@ -32,15 +32,14 @@ offlineCancelDownloadsAlertTitle=Cancel All Downloads?
offlineCancelDownloadsAlertMsg=If you go offline now, 1 download will be canceled. Are you sure you want to go offline?
offlineCancelDownloadsAlertMsgMultiple=If you go offline now, %S downloads will be canceled. Are you sure you want to go offline?
leavePrivateBrowsingCancelDownloadsAlertTitle=Cancel All Downloads?
leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=If you close all Private Browsing windows now, 1 download will be canceled. Are you sure you want to leave the Private Browsing mode?
leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=If you close all Private Browsing windows now, %S downloads will be canceled. Are you sure you want to leave the Private Browsing mode?
leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=If you close all Private Browsing windows now, 1 download will be canceled. Are you sure you want to leave Private Browsing?
leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=If you close all Private Browsing windows now, %S downloads will be canceled. Are you sure you want to leave Private Browsing?
cancelDownloadsOKText=Cancel 1 Download
cancelDownloadsOKTextMultiple=Cancel %S Downloads
dontQuitButtonWin=Don't Exit
dontQuitButtonMac=Don't Quit
dontGoOfflineButton=Stay Online
dontEnterPrivateBrowsingButton=Don't Enter the Private Browsing Mode
dontLeavePrivateBrowsingButton=Stay in Private Browsing Mode
dontLeavePrivateBrowsingButton2=Stay in Private Browsing
downloadsCompleteTitle=Downloads Complete
downloadsCompleteMsg=All files have finished downloading.