Skip to content

Commit

Permalink
Bug 1496240 - Change 'Blocked' to 'Blocking' for in Content Blocking …
Browse files Browse the repository at this point in the history
…Categories doorhanger part r=johannh

Differential Revision: https://phabricator.services.mozilla.com/D8793

--HG--
extra : moz-landing-system : lando
  • Loading branch information
MichaelKohler committed Oct 16, 2018
1 parent 6cd123e commit af087b7
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
6 changes: 3 additions & 3 deletions browser/components/controlcenter/content/panel.inc.xul
Expand Up @@ -89,15 +89,15 @@
class="identity-popup-content-blocking-category" align="center" role="group">
<image class="identity-popup-content-blocking-category-icon fastblock-icon"/>
<label flex="1" class="identity-popup-content-blocking-category-label">&contentBlocking.fastBlock.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-state-label">&contentBlocking.fastBlock.blocked.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-state-label">&contentBlocking.fastBlock.blocking.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-add-blocking text-link"
onclick="ContentBlocking.openPreferences('identityPopup-CB-fastblock'); gIdentityHandler.recordClick('fb_add_blocking');">&contentBlocking.fastBlock.add.label;</label>
</hbox>
<hbox id="identity-popup-content-blocking-category-tracking-protection"
class="identity-popup-content-blocking-category" align="center" role="group">
<image class="identity-popup-content-blocking-category-icon tracking-protection-icon"/>
<label flex="1" class="identity-popup-content-blocking-category-label">&contentBlocking.trackingProtection3.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-state-label">&contentBlocking.trackingProtection.blocked.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-state-label">&contentBlocking.trackingProtection.blocking.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-add-blocking text-link"
id="identity-popup-tracking-protection-add-blocking"
onclick="ContentBlocking.openPreferences('identityPopup-CB-tracking-protection'); gIdentityHandler.recordClick('tp_add_blocking');">&contentBlocking.trackingProtection.add.label;</label>
Expand All @@ -106,7 +106,7 @@
class="identity-popup-content-blocking-category" align="center" role="group">
<image class="identity-popup-content-blocking-category-icon thirdpartycookies-icon"/>
<label flex="1" class="identity-popup-content-blocking-category-label">&contentBlocking.3rdPartyCookies.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-state-label">&contentBlocking.3rdPartyCookies.blocked.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-state-label">&contentBlocking.3rdPartyCookies.blocking.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-add-blocking text-link"
id="identity-popup-3rdpartycookies-add-blocking"
onclick="ContentBlocking.openPreferences('identityPopup-CB-3rdpartycookies'); gIdentityHandler.recordClick('cookies_add_blocking');">&contentBlocking.3rdPartyCookies.add.label;</label>
Expand Down
15 changes: 15 additions & 0 deletions browser/locales/en-US/chrome/browser/browser.dtd
Expand Up @@ -969,6 +969,11 @@ you can use these alternative items. Otherwise, their values should be empty. -
a positive thing. It forms the end of the (imaginary) sentence
"Slow-Loading Trackers [are] Blocked"-->
<!ENTITY contentBlocking.fastBlock.blocked.label "Blocked">
<!-- LOCALIZATION NOTE (contentBlocking.fastBlock.blocking.label):
This label signals that this type of content blocking is turned
ON, so this is a positive thing. It forms the verb in (imaginary) sentence
"Firefox is blocking Slow-Loading Trackers"-->
<!ENTITY contentBlocking.fastBlock.blocking.label "Blocking">
<!-- LOCALIZATION NOTE (contentBlocking.fastBlock.add.label):
This is displayed as a link to preferences, where the user can add
this specific type of content blocking. When this text is shown
Expand All @@ -983,6 +988,11 @@ you can use these alternative items. Otherwise, their values should be empty. -
a positive thing. It forms the end of the (imaginary) sentence
"Trackers [are] Blocked"-->
<!ENTITY contentBlocking.trackingProtection.blocked.label "Blocked">
<!-- LOCALIZATION NOTE (contentBlocking.tranckingProtection.blocking.label):
This label signals that this type of content blocking is turned
ON, so this is a positive thing. It forms the verb in the (imaginary) sentence
"Firefox is blocking Trackers"-->
<!ENTITY contentBlocking.trackingProtection.blocking.label "Blocking">
<!-- LOCALIZATION NOTE (contentBlocking.trackingProtection.add.label):
This is displayed as a link to preferences, where the user can add
this specific type of content blocking. When this text is shown
Expand All @@ -996,6 +1006,11 @@ you can use these alternative items. Otherwise, their values should be empty. -
a positive thing. It forms the end of the (imaginary) sentence
"Third-Party Cookies [are] Blocked"-->
<!ENTITY contentBlocking.3rdPartyCookies.blocked.label "Blocked">
<!-- LOCALIZATION NOTE (contentBlocking.tranckingProtection.blocking.label):
This label signals that this type of content blocking is turned
ON, so this is a positive thing. It forms the verb in the (imaginary) sentence
"Firefox is blocking Third-Party Cookies"-->
<!ENTITY contentBlocking.3rdPartyCookies.blocking.label "Blocking">
<!-- LOCALIZATION NOTE (contentBlocking.3rdPartyCookies.add.label):
This is displayed as a link to preferences, where the user can add
this specific type of content blocking. When this text is shown
Expand Down

0 comments on commit af087b7

Please sign in to comment.