зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1441198 - Part 1 - Use correct copy for cookies and site data in about:preferences. r=nhnt11
This mostly changes "cookies" to "cookies and site data" and amends a few other details. MozReview-Commit-ID: 97xTSQPw2DA --HG-- extra : rebase_source : 63ceb2e11cad77441dbf11b298d6035081a29123
This commit is contained in:
Johann Hofmann
Родитель
a97cfe398f
Коммит
25f14b2ad4
|
|
@ -408,7 +408,7 @@ var gPrivacyPane = {
|
|||
signonBundle.getString("loginsDescriptionAll2"),
|
||||
]);
|
||||
appendSearchKeywords("cookieExceptions", [
|
||||
bundlePrefs.getString("cookiepermissionstext"),
|
||||
bundlePrefs.getString("cookiepermissionstext1"),
|
||||
]);
|
||||
appendSearchKeywords("trackingProtectionExceptions", [
|
||||
bundlePrefs.getString("trackingprotectionpermissionstitle"),
|
||||
|
|
@ -454,7 +454,7 @@ var gPrivacyPane = {
|
|||
pkiBundle.getString("enable_fips"),
|
||||
]);
|
||||
appendSearchKeywords("siteDataSettings", [
|
||||
bundlePrefs.getString("siteDataSettings2.description"),
|
||||
bundlePrefs.getString("siteDataSettings3.description"),
|
||||
bundlePrefs.getString("removeAllCookies.label"),
|
||||
bundlePrefs.getString("removeSelectedCookies.label"),
|
||||
]);
|
||||
|
|
@ -881,8 +881,8 @@ var gPrivacyPane = {
|
|||
allowVisible: true,
|
||||
prefilledHost: "",
|
||||
permissionType: "cookie",
|
||||
windowTitle: bundlePreferences.getString("cookiepermissionstitle"),
|
||||
introText: bundlePreferences.getString("cookiepermissionstext")
|
||||
windowTitle: bundlePreferences.getString("cookiepermissionstitle1"),
|
||||
introText: bundlePreferences.getString("cookiepermissionstext1")
|
||||
};
|
||||
gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
|
||||
null, params);
|
||||
|
|
@ -1405,7 +1405,7 @@ var gPrivacyPane = {
|
|||
let totalSiteDataSizeLabel = document.getElementById("totalSiteDataSize");
|
||||
let totalUsage = siteDataUsage + cacheUsage;
|
||||
let size = DownloadUtils.convertByteUnits(totalUsage);
|
||||
totalSiteDataSizeLabel.textContent = prefStrBundle.getFormattedString("totalSiteDataSize1", size);
|
||||
totalSiteDataSizeLabel.textContent = prefStrBundle.getFormattedString("totalSiteDataSize2", size);
|
||||
});
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -75,12 +75,12 @@
|
|||
<hbox>
|
||||
<menulist id="historyMode">
|
||||
<menupopup>
|
||||
<menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription.label;"/>
|
||||
<menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription1.label;"/>
|
||||
<menuitem label="&historyHeader.dontremember.label;" value="dontremember" searchkeywords="&dontrememberDescription.label;"/>
|
||||
<menuitem label="&historyHeader.custom.label;" value="custom" searchkeywords="&privateBrowsingPermanent2.label;
|
||||
&rememberHistory2.label;
|
||||
&rememberSearchForm.label;
|
||||
&acceptCookies3.label;
|
||||
&acceptCookies4.label;
|
||||
&cookieExceptions.label;
|
||||
&acceptThirdParty3.pre.label;
|
||||
&acceptThirdParty.always.label;
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
<vbox id="historyRememberPane">
|
||||
<hbox align="center" flex="1">
|
||||
<vbox flex="1">
|
||||
<description>&rememberDescription.label;</description>
|
||||
<description>&rememberDescription1.label;</description>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
|
|
|||
|
|
@ -30,11 +30,3 @@ add_task(async function() {
|
|||
await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
||||
});
|
||||
|
||||
/**
|
||||
* Test for searching for the "Settings - Site Data" subdialog.
|
||||
*/
|
||||
add_task(async function() {
|
||||
await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
||||
await evaluateSearchResults("store site data on your computer", "siteDataGroup");
|
||||
await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ add_task(async function() {
|
|||
.then(usage => {
|
||||
actual = totalSiteDataSizeLabel.textContent;
|
||||
expected = prefStrBundle.getFormattedString(
|
||||
"totalSiteDataSize1", DownloadUtils.convertByteUnits(usage + cacheSize));
|
||||
"totalSiteDataSize2", DownloadUtils.convertByteUnits(usage + cacheSize));
|
||||
is(actual, expected, "Should show the right total site data size");
|
||||
});
|
||||
|
||||
|
|
@ -109,7 +109,7 @@ add_task(async function() {
|
|||
.then(usage => {
|
||||
actual = totalSiteDataSizeLabel.textContent;
|
||||
expected = prefStrBundle.getFormattedString(
|
||||
"totalSiteDataSize1", DownloadUtils.convertByteUnits(usage + cacheSize));
|
||||
"totalSiteDataSize2", DownloadUtils.convertByteUnits(usage + cacheSize));
|
||||
is(actual, expected, "Should show the right total site data size");
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ let gSiteDataSettings = {
|
|||
|
||||
let brandShortName = document.getElementById("bundle_brand").getString("brandShortName");
|
||||
let settingsDescription = document.getElementById("settingsDescription");
|
||||
settingsDescription.textContent = this._prefStrBundle.getFormattedString("siteDataSettings2.description", [brandShortName]);
|
||||
settingsDescription.textContent = this._prefStrBundle.getFormattedString("siteDataSettings3.description", [brandShortName]);
|
||||
|
||||
setEventListener("sitesList", "select", this.onSelect);
|
||||
setEventListener("hostCol", "click", this.onClickTreeCol);
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ acceptVeryLargeMinimumFont=Keep my changes anyway
|
|||
|
||||
trackingprotectionpermissionstext2=You have disabled Tracking Protection on these websites.
|
||||
trackingprotectionpermissionstitle=Exceptions - Tracking Protection
|
||||
cookiepermissionstext=You can specify which websites are always or never allowed to use cookies. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
|
||||
cookiepermissionstitle=Exceptions - Cookies
|
||||
cookiepermissionstext1=You can specify which websites are always or never allowed to use cookies and site data. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
|
||||
cookiepermissionstitle1=Exceptions - Cookies and Site Data
|
||||
addonspermissionstext=You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
|
||||
addons_permissions_title2=Allowed Websites - Add-ons Installation
|
||||
popuppermissionstext=You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow.
|
||||
|
|
@ -166,19 +166,19 @@ removeSelectedCookies.accesskey=R
|
|||
|
||||
defaultUserContextLabel=None
|
||||
|
||||
# LOCALIZATION NOTE (totalSiteDataSize1, siteUsage, siteUsagePersistent):
|
||||
# LOCALIZATION NOTE (totalSiteDataSize2, siteUsage, siteUsagePersistent):
|
||||
# This is the total usage of site data, where we insert storage size and unit.
|
||||
# e.g., "The total usage is currently 200 MB"
|
||||
# %1$S = size
|
||||
# %2$S = unit (MB, KB, etc.)
|
||||
totalSiteDataSize1=Your stored site data and cache are currently using %1$S %2$S of disk space
|
||||
totalSiteDataSize2=Your stored cookies, site data and cache are currently using %1$S %2$S of disk space.
|
||||
siteUsage=%1$S %2$S
|
||||
siteUsagePersistent=%1$S %2$S (Persistent)
|
||||
loadingSiteDataSize1=Calculating site data and cache size…
|
||||
|
||||
acceptRemove=Remove
|
||||
# LOCALIZATION NOTE (siteDataSettings2.description): %S = brandShortName
|
||||
siteDataSettings2.description=The following websites store site data on your computer. %S keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
|
||||
# LOCALIZATION NOTE (siteDataSettings3.description): %S = brandShortName
|
||||
siteDataSettings3.description=The following websites store cookies and site data on your computer. %S keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
|
||||
# LOCALIZATION NOTE (removeAllSiteData, removeAllSiteDataShown):
|
||||
# removeAllSiteData and removeAllSiteDataShown are both used on the same one button,
|
||||
# never displayed together and can share the same accesskey.
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@
|
|||
|
||||
<!ENTITY suggestionSettings2.label "Change preferences for search engine suggestions">
|
||||
|
||||
<!ENTITY acceptCookies3.label "Accept cookies and site data from websites">
|
||||
<!ENTITY acceptCookies3.accesskey "A">
|
||||
<!ENTITY acceptCookies4.label "Accept cookies and site data from websites (recommended)">
|
||||
<!ENTITY acceptCookies4.accesskey "A">
|
||||
|
||||
<!ENTITY blockCookies.label "Block cookies and site data (may cause websites to break)">
|
||||
<!ENTITY blockCookies.accesskey "B">
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
<!ENTITY historyHeader.custom.label "Use custom settings for history">
|
||||
<!ENTITY historyHeader.post.label "">
|
||||
|
||||
<!ENTITY rememberDescription.label "&brandShortName; will remember your browsing, download, form and search history, and keep cookies from websites you visit.">
|
||||
<!ENTITY rememberDescription1.label "&brandShortName; will remember your browsing, download, form and search history.">
|
||||
|
||||
<!ENTITY dontrememberDescription.label "&brandShortName; will use the same settings as private browsing, and will not remember any history as you browse the Web.">
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче