MB 37: Customization for the about dialog

browser/base/content/aboutDialog.xhtml

@@ -37,6 +37,7 @@
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="browser/aboutDialog.ftl"/>
     <html:link rel="localization" href="toolkit/global/base-browser.ftl"/>
+    <html:link rel="localization" href="browser/aboutDialogMullvad.ftl"/>
   </linkset>
 
   <html:div id="aboutDialogContainer">
@@ -112,10 +113,12 @@
                 <label id="version" class="update"/>
                 <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>
               </hbox>
+#ifndef MULLVAD_BROWSER
               <description class="text-blurb">
                 <label is="text-link" onclick="openHelpLink('firefox-help')" data-l10n-id="aboutdialog-help-user"/>
                 <label id="submit-feedback" is="text-link" onclick="openFeedbackPage()" data-l10n-id="aboutdialog-submit-feedback"/>
               </description>
+#endif
             </vbox>
 #endif
           </hbox>
@@ -134,14 +137,14 @@
               <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>
             </description>
           </vbox>
-          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
-            <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/>
-            <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
+          <description class="text-blurb" data-l10n-id="mullvad-about-desc">
+            <label is="text-link" href="https://mullvad.net" data-l10n-name="mullvad-about-mullvadLink"/>
+            <label is="text-link" href="https://www.torproject.org" data-l10n-name="mullvad-about-torProjectLink"/>
           </description>
-          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
-            <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
-            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
+          <description class="text-blurb">
+            <label is="text-link" href="https://mullvad.net/browser" data-l10n-id="mullvad-about-readMore"/>
           </description>
+          <description class="text-blurb" data-l10n-id="mullvad-about-feedback2" data-l10n-args='{"emailAddress":"support@mullvadvpn.net"}'/>
         </vbox>
       </vbox>
     </hbox>
@@ -149,7 +152,8 @@
       <hbox pack="center">
         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>
-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>
+        <label is="text-link" class="bottom-link" href="https://mullvad.net/en/help/privacy-policy/" data-l10n-id="bottomLinks-privacy"/>
+        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:telemetry" data-l10n-id="mullvad-about-telemetryLink"/>
       </hbox>
       <description id="trademark" data-l10n-id="trademarkInfo"></description>
     </vbox>

browser/locales/en-US/browser/aboutDialogMullvad.ftl

+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Variables
+##   $emailAddress (String) - The email address of Mullvad's support
+
+mullvad-about-desc = { -brand-short-name }  is a privacy-focused web browser developed in collaboration between <label data-l10n-name="mullvad-about-mullvadLink">Mullvad VPN</label> and the <label data-l10n-name="mullvad-about-torProjectLink">Tor Project</label>. It’s produced to minimize tracking and fingerprinting.
+mullvad-about-readMore = Read more
+mullvad-about-feedback2 = Help & feedback: { $emailAddress }
+mullvad-about-telemetryLink = Telemetry

tools/lint/fluent-lint/exclusions.yml

@@ -77,6 +77,9 @@ ID01:
         - networkProtocolError-title
         - nssBadCert-title
         - nssBadCert-sts-title
+        # Mullvad browser identifiers we created before we applied the linters.
+        - mullvad-about-readMore
+        - mullvad-about-telemetryLink
     files:
         # policies-descriptions.ftl: These IDs are generated programmatically
         # from policy names.
@@ -84,6 +87,7 @@ ID01:
         # The webext-perms-description-* IDs are generated programmatically
         # from permission names
         - toolkit/locales/en-US/toolkit/global/extensionPermissions.ftl
+        - browser/locales/en-US/browser/aboutDialogMullvad.ftl
 ID02:
     messages:
         # browser/components/ion/content/ion.ftl