зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1480900 - Part 1: Update the Content Blocking section copy based on the latest strings; r=johannh,flod
--HG-- extra : source : 8e60483ec8240efee22522316f5210289e12cbd2
This commit is contained in:
Ehsan Akhgari
Родитель
c8483bebfa
Коммит
7e546de83b
|
|
@ -63,7 +63,9 @@ const extensionControlledL10nKeys = {
|
|||
"newTabURL": "new-tab-url",
|
||||
"defaultSearch": "default-search",
|
||||
"privacy.containers": "privacy-containers",
|
||||
"websites.trackingProtectionMode": "websites-tracking-protection-mode",
|
||||
"websites.trackingProtectionMode": contentBlockingUiEnabled ?
|
||||
"websites-content-blocking-all-trackers" :
|
||||
"websites-tracking-protection-mode",
|
||||
"proxy.settings": "proxy-config",
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@
|
|||
<label data-l10n-id="content-blocking-fastblock-slow-loading-label"
|
||||
class="content-blocking-category-name"
|
||||
control="contentBlockingFastBlockCheckbox"/>
|
||||
<description data-l10n-id="content-blocking-fastblock-description" class="content-blocking-category-description"/>
|
||||
<description data-l10n-id="content-blocking-fastblock-new-description" class="content-blocking-category-description"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<vbox>
|
||||
|
|
@ -367,7 +367,7 @@
|
|||
<label data-l10n-id="content-blocking-tracking-protection-all-label"
|
||||
class="content-blocking-category-name"
|
||||
control="contentBlockingTrackingProtectionCheckbox"/>
|
||||
<description data-l10n-id="content-blocking-tracking-protection-description"
|
||||
<description data-l10n-id="content-blocking-tracking-protection-new-description"
|
||||
class="content-blocking-category-description"
|
||||
id="trackingProtectionMenuDesc"/>
|
||||
<radiogroup id="trackingProtectionMenu"
|
||||
|
|
@ -379,7 +379,7 @@
|
|||
data-l10n-id="content-blocking-tracking-protection-option-always"
|
||||
flex="1" />
|
||||
</radiogroup>
|
||||
<label id="changeBlockListLink" data-l10n-id="content-blocking-tracking-protection-change-blocklist" class="text-link"/>
|
||||
<label id="changeBlockListLink" data-l10n-id="content-blocking-tracking-protection-change-block-list" class="text-link"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
|
@ -403,13 +403,13 @@
|
|||
class="content-blocking-category-description"/>
|
||||
<hbox id="warningAllCookiesBlocked">
|
||||
<image class="reject-trackers-warning-icon"/>
|
||||
<description data-l10n-id="content-blocking-reject-trackers-warning-all-cookies-blocked"
|
||||
class="content-blocking-category-description"/>
|
||||
<description data-l10n-id="content-blocking-reject-trackers-warning-your-settings-prevent-changes"
|
||||
class="content-blocking-category-description description-with-side-element"/>
|
||||
</hbox>
|
||||
<hbox id="warningFromVisitedCookiesBlocked">
|
||||
<image class="reject-trackers-warning-icon"/>
|
||||
<description data-l10n-id="content-blocking-reject-trackers-warning-from-unvisited-cookies-blocked"
|
||||
class="content-blocking-category-description"/>
|
||||
<description data-l10n-id="content-blocking-reject-trackers-warning-your-settings-prevent-changes"
|
||||
class="content-blocking-category-description description-with-side-element"/>
|
||||
</hbox>
|
||||
</deck>
|
||||
</vbox>
|
||||
|
|
|
|||
|
|
@ -534,6 +534,7 @@ add_task(async function testExtensionControlledTrackingProtection() {
|
|||
};
|
||||
|
||||
let tpEnabledPref = () => Services.prefs.getBoolPref(TP_PREF);
|
||||
let cbUIEnabledPref = () => Services.prefs.getBoolPref(CB_UI_PREF);
|
||||
|
||||
await SpecialPowers.pushPrefEnv(
|
||||
{"set": [[TP_PREF, TP_DEFAULT], [CB_UI_PREF, true]]});
|
||||
|
|
@ -553,7 +554,8 @@ add_task(async function testExtensionControlledTrackingProtection() {
|
|||
if (isControlled) {
|
||||
let controlledDesc = controlledLabel.querySelector("description");
|
||||
Assert.deepEqual(doc.l10n.getAttributes(controlledDesc), {
|
||||
id: "extension-controlled-websites-tracking-protection-mode",
|
||||
id: cbUIEnabledPref() ? "extension-controlled-websites-content-blocking-all-trackers" :
|
||||
"extension-controlled-websites-tracking-protection-mode",
|
||||
args: {
|
||||
name: "set_tp",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -108,6 +108,10 @@ extension-controlled-privacy-containers = An extension, <img data-l10n-name="ico
|
|||
# are being controlled by an extension.
|
||||
extension-controlled-websites-tracking-protection-mode = An extension, <img data-l10n-name="icon"/> { $name }, is controlling tracking protection.
|
||||
|
||||
# This string is shown to notify the user that their content blocking "All Detected Trackers"
|
||||
# preferences are being controlled by an extension.
|
||||
extension-controlled-websites-content-blocking-all-trackers = An extension, <img data-l10n-name="icon"/> { $name }, is controlling this setting.
|
||||
|
||||
# This string is shown to notify the user that their proxy configuration preferences
|
||||
# are being controlled by an extension.
|
||||
extension-controlled-proxy-config = An extension, <img data-l10n-name="icon"/> { $name }, is controlling how { -brand-short-name } connects to the internet.
|
||||
|
|
@ -811,7 +815,7 @@ content-blocking-header = Content Blocking
|
|||
|
||||
content-blocking-desc = Block third-party content, like ads or code, that can slow your browsing and track you around the web. Customize your settings for the best balance of protection and performance.
|
||||
|
||||
content-blocking-learn-more = Learn More
|
||||
content-blocking-learn-more = Learn more
|
||||
content-blocking-restore-defaults =
|
||||
.label = Restore Defaults
|
||||
.accesskey = R
|
||||
|
|
@ -833,29 +837,26 @@ content-blocking-category-label = Choose what to block
|
|||
# have not finished loading after a certain threshold of seconds.
|
||||
content-blocking-fastblock-slow-loading-label = Slow-Loading Trackers
|
||||
.accesskey = S
|
||||
content-blocking-fastblock-description = Blocks third-party content that takes longer than 5 seconds to load.
|
||||
content-blocking-fastblock-new-description = Block just the trackers that keep pages from loading quickly.
|
||||
content-blocking-tracking-protection-all-label = All Detected Trackers
|
||||
.accesskey = T
|
||||
content-blocking-tracking-protection-description = Blocks all known trackers (Note: may also prevent some pages from loading).
|
||||
content-blocking-tracking-protection-new-description = Block all known trackers. (May prevent some pages from loading.)
|
||||
content-blocking-tracking-protection-option-always =
|
||||
.label = Always
|
||||
.accesskey = A
|
||||
content-blocking-tracking-protection-option-private =
|
||||
.label = Only in private windows
|
||||
.accesskey = p
|
||||
content-blocking-tracking-protection-change-blocklist = Change Block List…
|
||||
content-blocking-tracking-protection-change-block-list = Change block list
|
||||
|
||||
content-blocking-reject-trackers-label = Third-Party Cookies
|
||||
.accesskey = C
|
||||
content-blocking-reject-trackers-description = Block all third-party cookies or just those set by trackers.
|
||||
# This is a warning message shown next to a yellow warning icon when the Third-Party Cookies subsection
|
||||
# of the Content Blocking UI in Preferences has been disabled due to the "All cookies" option
|
||||
# being selected in the Cookies and Site Data section of the UI.
|
||||
content-blocking-reject-trackers-warning-all-cookies-blocked = All cookies are currently blocked.
|
||||
# This is a warning message shown next to a yellow warning icon when the Third-Party Cookies subsection
|
||||
# of the Content Blocking UI in Preferences has been disabled due to the "Cookies from unvisited websites"
|
||||
# option being selected in the Cookies and Site Data section of the UI.
|
||||
content-blocking-reject-trackers-warning-from-unvisited-cookies-blocked = Cookies from unvisited websites are currently blocked.
|
||||
# of the Content Blocking UI in Preferences has been disabled due to the either the "All cookies" option
|
||||
# or the "Cookies from unvisited websites" option being selected in the Cookies and Site Data section of
|
||||
# the UI.
|
||||
content-blocking-reject-trackers-warning-your-settings-prevent-changes = Your settings in Cookies and Site Data are preventing changes to Third-Party Cookies settings.
|
||||
content-blocking-change-cookie-settings =
|
||||
.label = Change Cookie Settings
|
||||
.accesskey = S
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче