Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1511820 - clarify private browsing tabs for quit warning, r=flod

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D14470

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Gijs Kruitbosch 2018-12-14 12:08:33 +00:00
parent 5a4109cbb9
commit 924308bb6a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/nsBrowserGlue.js
View File

@ -1831,13 +1831,13 @@ BrowserGlue.prototype = {
let tabSubstring = gTabbrowserBundle.GetStringFromName("tabs.closeWarningMultipleWindowsTabSnippet");
tabSubstring = PluralForm.get(pagecount, tabSubstring).replace(/#1/, pagecount);
let stringID = sessionWillBeRestored ? "tabs.closeWarningMultipleWindowsSessionRestore"
let stringID = sessionWillBeRestored ? "tabs.closeWarningMultipleWindowsSessionRestore2"
: "tabs.closeWarningMultipleWindows";
let windowString = gTabbrowserBundle.GetStringFromName(stringID);
windowString = PluralForm.get(windowcount, windowString).replace(/#1/, windowcount);
warningMessage = windowString.replace(/%(?:1\$)?S/i, tabSubstring);
} else {
let stringID = sessionWillBeRestored ? "tabs.closeWarningMultipleSessionRestore"
let stringID = sessionWillBeRestored ? "tabs.closeWarningMultipleSessionRestore2"
: "tabs.closeWarningMultiple";
warningMessage = gTabbrowserBundle.GetStringFromName(stringID);
warningMessage = PluralForm.get(pagecount, warningMessage).replace("#1", pagecount);

22
browser/locales/en-US/chrome/browser/tabbrowser.properties
View File

@ -15,12 +15,17 @@ tabs.closeAndQuitTitleTabsWin=Exit and close tabs?
# The singular form is not considered since this string is used only for
# multiple tabs.
tabs.closeWarningMultiple=;You are about to close #1 tabs. Are you sure you want to continue?
# LOCALIZATION NOTE (tabs.closeWarningMultipleSessionRestore):
# LOCALIZATION NOTE (tabs.closeWarningMultipleSessionRestore2):
# Semicolon-separated list of plural forms. See:
# http://developer.mozilla.org/en/docs/Localization_and_Plurals
# The singular form is not considered since this string is used only for
# multiple tabs.
tabs.closeWarningMultipleSessionRestore=;You are about to close #1 tabs. These tabs will be restored when you restart. Are you sure you want to continue?
# The forms for 0 or 1 items are not considered since this string is used only
# for multiple tabs.
# If
# "Tabs in non-private windows will be restored when you restart"
# is difficult to translate, you could translate
# "Tabs (except those in private windows) will be restored when you restart"
# instead.
tabs.closeWarningMultipleSessionRestore2=;You are about to close #1 tabs. Tabs in non-private windows will be restored when you restart. Are you sure you want to continue?
tabs.closeButtonMultiple=Close tabs
tabs.closeWarningPromptMe=Warn me when I attempt to close multiple tabs
@ -33,15 +38,20 @@ tabs.closeWarningPromptMe=Warn me when I attempt to close multiple tabs
# of tabs in these windows.
# Note that every one of these plural forms must contain one instance of '%S'.
tabs.closeWarningMultipleWindows=;You are about to close #1 windows %S. Are you sure you want to continue?
# LOCALIZATION NOTE (tabs.closeWarningMultipleWindowsSessionRestore):
# LOCALIZATION NOTE (tabs.closeWarningMultipleWindowsSessionRestore2):
# Semicolon-separated list of plural forms. See:
# http://developer.mozilla.org/en/docs/Localization_and_Plurals
# The forms for 0 or 1 items are not considered since this string is used only for
# multiple windows. The %S replacement form will be replaced with the contents
# of tabs.closeWarningMultipleWindowsTabSnippet, which will contain the number
# of tabs in these windows.
# If
# "Tabs in non-private windows will be restored when you restart"
# is difficult to translate, you could translate
# "Tabs (except those in private windows) will be restored when you restart"
# instead.
# Note that every one of these plural forms must contain one instance of '%S'.
tabs.closeWarningMultipleWindowsSessionRestore=;You are about to close #1 windows %S. These tabs will be restored when you restart. Are you sure you want to continue?
tabs.closeWarningMultipleWindowsSessionRestore2=;You are about to close #1 windows %S. Tabs in non-private windows will be restored when you restart. Are you sure you want to continue?
# LOCALIZATION NOTE (tabs.closeWarningMultipleWindowsTabSnippet):
# Semicolon-separated list of plural forms. See: