Tos copy updates (fix #16016) (#16018)

* ToS copy updates (fix #16016)

* Apply suggestions from code review - copy change

Co-authored-by: maureenlholland <maureen@silverorange.com>

---------

Co-authored-by: maureenlholland <maureen@silverorange.com>

Author: wen-2018

bedrock/firefox/templates/firefox/browsers/update-browser.html

@@ -42,7 +42,12 @@ <h2 class="c-section-title">The fastest Firefox yet</h2>
       We work tirelessly to make sure Firefox is the fastest it can be, while making sure it doesn’t hog your memory or system resources. With each version we make improvements to the code that makes Firefox quick and nimble as you browse.
     </p>
 
-    <h2 class="c-section-title">The best privacy</h2>
+    {% if switch('firefox-tou') %}
+      <h2 class="c-section-title">Always protected</h2>
+    {% else %}
+      <h2 class="c-section-title">The best privacy</h2>
+    {% endif %}
+
     <p>
     {% with privacy="https://blog.mozilla.org/firefox/make-your-firefox-browser-a-privacy-superpower-with-these-extensions/"%}
       We are passionate about user privacy. With each new release we give you more ways to control who sees and accesses your personal browsing data. Tracking protection, private browsing and <a href="{{ privacy }}">powerful privacy extensions</a> all work together to make sure your private browsing information stays yours.
@@ -58,9 +63,13 @@ <h2 class="c-section-title">New features</h2>
 
     <img src="{{ static('img/firefox/browsers/update-browser/device.png') }}" alt="" class="c-article-image" width="1232" height="806">
     <h1 class="mzp-c-article-title">Why Firefox?</h1>
-    <p>
-        Firefox is independent and a part of the not-for-profit Mozilla, which fights for your online rights, keeps corporate powers in check and makes the internet accessible to everyone, everywhere. We believe the internet is for people, not profit. Unlike other companies, we don’t sell access to your data. You’re in control over who sees your search and browsing history. All that and exceptional performance too.
-    </p>
+
+    {% if switch('firefox-tou') %}
+      <p>Firefox is independent and a part of the not-for-profit Mozilla, which fights for your online rights, keeps corporate powers in check and makes the internet accessible to everyone, everywhere. We believe the internet is for people, not profit. You’re in control over who sees your search and browsing history. All that and exceptional performance too.</p>
+    {% else %}
+      <p>Firefox is independent and a part of the not-for-profit Mozilla, which fights for your online rights, keeps corporate powers in check and makes the internet accessible to everyone, everywhere. We believe the internet is for people, not profit. Unlike other companies, we don’t sell access to your data. You’re in control over who sees your search and browsing history. All that and exceptional performance too.</p>
+    {% endif %}
+
     <h2 class="c-section-title">How do I update?</h2>
     <p>
     {% with version="https://blog.mozilla.org/firefox/info-worth-knowing-firefox-version-using/",

bedrock/firefox/templates/firefox/faq.html

@@ -68,9 +68,15 @@ <h1 class="mzp-u-title-lg">{{ ftl('firefox-faq')}}</h1>
     <ul class="faq-list">
       <li>
         <h2>{{ ftl('what-is-firefox') }}</h2>
-        <p>{{ ftl('the-firefox-browser',
-              url=url('firefox'),
-              url2=url('products.landing')) }}</p>
+        {% if switch('firefox-tou') %}
+          <p>{{ ftl('the-firefox-browser-the-only',
+            url=url('firefox'),
+            url2=url('products.landing')) }}</p>
+        {% else %}
+          <p>{{ ftl('the-firefox-browser',
+            url=url('firefox'),
+            url2=url('products.landing')) }}</p>
+        {% endif %}
       </li>
       <li>
         <h2>{{ ftl('how-do-i') }}</h2>
@@ -84,7 +90,11 @@ <h2>{{ ftl('how-do-i') }}</h2>
       </li>
       <li>
         <h2>{{ ftl('is-firefox-free') }}</h2>
-        <p>{{ ftl('yep-the-firefox') }}</p>
+        {% if switch('firefox-tou') %}
+          <p>{{ ftl('yep-the-firefox-browser-is-free') }}</p>
+        {% else %}
+          <p>{{ ftl('yep-the-firefox') }}</p>
+        {% endif %}
         <small>{{ ftl('related-questions-free') }}</small>
       </li>
       <li>
@@ -102,10 +112,12 @@ <h2>{{ ftl('is-firefox-safe') }}</h2>
         <p>{{ ftl('not-only-is', url=url('firefox.features.private')) }}</p>
         <small>{{ ftl('related-questions-safe') }}</small>
       </li>
-      <li>
-        <h2>{{ ftl('does-firefox-sell') }}</h2>
-        <p>{{ ftl('nope-never-have', url=url('privacy')) }}</p>
-      </li>
+      {% if not switch('firefox-tou') %}
+        <li>
+          <h2>{{ ftl('does-firefox-sell') }}</h2>
+          <p>{{ ftl('nope-never-have', url=url('privacy')) }}</p>
+        </li>
+      {% endif %}
       <li>
         <h2>{{ ftl('why-is-firefox') }}</h2>
         <p>{{ ftl('firefox-isnt-slow') }}</p>

bedrock/firefox/templates/firefox/includes/structured-data-firefox-faq.html

@@ -57,14 +57,6 @@
                     "text": "Not only is Firefox safe to use, it also helps keep your data and private information safe. The Firefox browser automatically blocks known third party trackers, social media trackers, cryptominers and fingerprinters from collecting your data. Learn more about the privacy in our products."
                 }
             },
-            {
-                "@type": "Question",
-                "name": "Does Firefox sell your personal data?",
-                "acceptedAnswer": {
-                    "@type": "Answer",
-                    "text": "Nope. Never have, never will. And we protect you from many of the advertisers who do. Firefox products are designed to protect your privacy. That’s a promise. "
-                }
-            },
             {
                 "@type": "Question",
                 "name": "Why is Firefox so slow?",

l10n/en/brands.ftl

@@ -185,10 +185,6 @@
 -brand-name-iphone = iPhone
 -brand-name-test-flight = TestFlight
 
-## Amazon products
-
--brand-name-fire-tv = Fire TV
-
 ## Facebook products
 
 -brand-name-facebook-messenger = Facebook Messenger

l10n/en/firefox/faq.ftl

@@ -16,7 +16,9 @@ what-is-firefox = What is { -brand-name-firefox }?
 # $url (url) - link to https://www.mozilla.org/firefox/browsers/
 # $url2 (url) - link to https://www.mozilla.org/products/
 
+# Obsolete string (expires 25-04-2025)
 the-firefox-browser = The { -brand-name-firefox-browser } is the only major browser backed by a not-for-profit that doesn’t sell your personal data to advertisers while helping you protect your personal information. Learn more about the <a href="{ $url }">{ -brand-name-firefox-browsers }</a> and <a href="{ $url2 }">other products.</a>
+the-firefox-browser-the-only = The { -brand-name-firefox-browser }, the only major browser backed by a not-for-profit, helps you protect your personal information. Learn more about the <a href="{ $url }">{ -brand-name-firefox-browsers }</a> and <a href="{ $url2 }">other products.</a>
 
 how-do-i = How do I get the { -brand-name-firefox-browser }?
 
@@ -30,7 +32,9 @@ how-do-i = How do I get the { -brand-name-firefox-browser }?
 you-can-easily = You can easily download the { -brand-name-firefox } desktop browser <a href="{ $url }">here.</a> { -brand-name-firefox } works on <a href="{ $url2 }">{ -brand-name-windows },</a> <a href="{ $url3 }">{ -brand-name-mac-short }</a> and <a href="{ $url4 }">{ -brand-name-linux}</a> devices, and is also available for <a href="{ $url5 }">{ -brand-name-android } and { -brand-name-ios }.</a> Make sure you’re downloading our browser from one of our trusted { -brand-name-mozilla }/{ -brand-name-firefox } pages.
 
 is-firefox-free = Is { -brand-name-firefox } free?
+# Obsolete string (expires 25-04-2025)
 yep-the-firefox = Yep! The { -brand-name-firefox-browser } is free. Super free, actually. No hidden costs or anything. You don’t pay anything to use it, and we don’t sell your personal data.
+yep-the-firefox-browser-is-free = Yep! The { -brand-name-firefox-browser } is free. Super free, actually. No hidden costs or anything. You don’t pay anything to use it.
 related-questions-free = Related questions: is { -brand-name-firefox-browser } free, does { -brand-name-firefox } cost money
 
 is-chrome-better = Is { -brand-name-chrome } better than { -brand-name-firefox }?
@@ -57,11 +61,13 @@ is-firefox-safe = Is { -brand-name-firefox } safe?
 not-only-is = Not only is { -brand-name-firefox } safe to use, it also helps keep your data and private information safe. The { -brand-name-firefox-browser } automatically blocks known third party trackers, social media trackers, cryptominers and fingerprinters from collecting your data. <a href="{ $url }">Learn more about the privacy in our products.</a>
 
 related-questions-safe = Related questions: is { -brand-name-firefox } good for privacy, is { -brand-name-firefox } secure, is { -brand-name-firefox } better for privacy
+# Obsolete string (expires 25-04-2025)
 does-firefox-sell = Does { -brand-name-firefox } sell your personal data?
 
 # Variables:
 # $url (url) - link to https://www.mozilla.org/firefox/privacy/
 
+# Obsolete string (expires 25-04-2025)
 nope-never-have = Nope. Never have, never will. And we protect you from many of the advertisers who do. { -brand-name-firefox } products are designed to protect your privacy. <a href="{ $url }">That’s a promise.</a>
 
 why-is-firefox = Why is { -brand-name-firefox } so slow?

l10n/en/firefox/features/shared.ftl

@@ -7,18 +7,3 @@
 features-shared-firefox-features = { -brand-name-firefox } Features
 features-shared-footer-cta-title = Do more with { -brand-name-firefox }
 features-shared-footer-cta-desc = Get the fast, lightweight, privacy-focused browser that’s backed by a non-profit and works across all your devices.
-features-shared-footer-cta-button = Download { -brand-name-firefox }
-features-shared-is-firefox-a-fast-browser = Is { -brand-name-firefox } a fast browser?
-features-shared-is-firefox-a-private-browser = Is { -brand-name-firefox } a private browser?
-features-shared-free-password-manager = Password manager
-features-shared-customize-your-firefox-browser = Customize your { -brand-name-firefox } browser
-features-shared-firefox-browser-sync = { -brand-name-firefox } browser sync
-features-shared-bookmark-manager = Bookmark manager
-features-shared-private-browsing-mode = Private browsing mode
-features-shared-firefox-add-ons-and-browser-extensions = { -brand-name-firefox } add-ons and browser extensions
-features-shared-pinned-browser-tabs = Pinned browser tabs
-features-shared-eyedropper-tool = Eyedropper tool
-features-shared-pdf-editor = PDF editor
-features-shared-fingerprinter-blocking = Fingerprinter blocking
-features-shared-translate-the-web = Translate the Web
-features-shared-picture-in-picture = Picture-in-Picture

l10n/en/privacy/index.ftl

@@ -39,13 +39,8 @@ privacy-index-read-more-about-our-ongoing = Read more about our ongoing privacy
 privacy-index-outdated-policies = Outdated Policies
 privacy-index-mozilla-websites-communications = { -brand-name-mozilla } Websites, Communications & Cookies
 privacy-index-firefox-browser = { -brand-name-firefox-browser }
-privacy-index-firefox-os = { -brand-name-firefox-os }
-privacy-index-firefox-private-network = { -brand-name-firefox-private-network }
-privacy-index-firefox-reality = { -brand-name-firefox-reality }
 privacy-index-firefox-focus = { -brand-name-firefox-focus }
 privacy-index-thunderbird = { -brand-name-thunderbird }
-privacy-index-firefox-better-web = { -brand-name-firefox-better-web }
-privacy-index-firefox-fire-tv = { -brand-name-firefox } for { -brand-name-fire-tv }
 privacy-index-mdn-plus = { -brand-name-mdn-plus }
 privacy-index-mozilla-subscription-services = { -brand-name-mozilla } Subscription Services