Pier Angelo Vendrame pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser

Commits: cbadd0c5 by Henry Wilkes at 2024-10-01T09:26:25+01:00 Mullvad Browser strings

This commit adds strings needed by the following Mullvad Browser patches.

- - - - - 96e5e78f by Henry Wilkes at 2024-10-01T09:26:26+01:00 fixup! MB 37: Customization for the about dialog

MB 349: Merge Fluent files into one.

- - - - - e0227da3 by Henry Wilkes at 2024-10-01T09:26:27+01:00 fixup! MB 39: Add home page about:mullvad-browser

MB 349: Merge Fluent files into one.

- - - - - 6243c664 by Henry Wilkes at 2024-10-01T09:26:28+01:00 fixup! MB 63: Customize some about pages for Mullvad Browser

MB 349: Merge Fluent files into one.

- - - - -

11 changed files:

- browser/base/content/aboutDialog.xhtml - browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml - browser/components/preferences/preferences.xhtml - − browser/locales/en-US/browser/aboutDialogMullvad.ftl - − browser/locales/en-US/browser/mullvad-browser/preferences.ftl - toolkit/content/aboutRightsMullvad.xhtml - toolkit/content/aboutTelemetryMullvad.xhtml - − toolkit/locales/en-US/toolkit/about/aboutRightsMullvad.ftl - − toolkit/locales/en-US/toolkit/about/aboutTelemetryMullvad.ftl - browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl → toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - tools/lint/fluent-lint/exclusions.yml

Changes:

===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -37,7 +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"/> + <html:link rel="localization" href="toolkit/global/mullvad-browser.ftl"/> </linkset>

<html:div id="aboutDialogContainer">

===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml ===================================== @@ -17,10 +17,7 @@ /> <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> - <link - rel="localization" - href="browser/mullvad-browser/aboutMullvadBrowser.ftl" - /> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" />

<script src="chrome://browser/content/mullvad-browser/aboutMullvadBrowser.js"></script> </head>

===================================== browser/components/preferences/preferences.xhtml ===================================== @@ -80,7 +80,7 @@ <link rel="localization" href="security/certificates/deviceManager.ftl"/> <link rel="localization" href="toolkit/updates/history.ftl"/> <link rel="localization" href="toolkit/global/base-browser.ftl"/> - <link rel="localization" href="browser/mullvad-browser/preferences.ftl"/> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl"/>

<link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>

===================================== browser/locales/en-US/browser/aboutDialogMullvad.ftl deleted ===================================== @@ -1,11 +0,0 @@ -# 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

===================================== browser/locales/en-US/browser/mullvad-browser/preferences.ftl deleted ===================================== @@ -1,2 +0,0 @@ -home-mode-choice-mullvad = - .label = { -brand-product-name } Home

===================================== toolkit/content/aboutRightsMullvad.xhtml ===================================== @@ -21,7 +21,7 @@ /> <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="toolkit/about/aboutRights.ftl" /> - <link rel="localization" href="toolkit/about/aboutRightsMullvad.ftl" /> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" /> </head>

<body id="your-rights" class="aboutPageWideContainer">

===================================== toolkit/content/aboutTelemetryMullvad.xhtml ===================================== @@ -20,7 +20,7 @@ type="text/css" /> <link rel="localization" href="branding/brand.ftl" /> - <link rel="localization" href="toolkit/about/aboutTelemetryMullvad.ftl" /> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" /> </head>

<body id="your-rights" class="aboutPageWideContainer">

===================================== toolkit/locales/en-US/toolkit/about/aboutRightsMullvad.ftl deleted ===================================== @@ -1,10 +0,0 @@ -# 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/. - -rights-mullvad-intro = { -brand-short-name } is free and open source software. -rights-mullvad-you-should-know = There are a few things you should know: -rights-mullvad-trademarks = - You are not granted any trademark rights or licenses to the trademarks of - the { -brand-short-name } or any party, including without limitation the - { -brand-short-name } name or logo.

===================================== toolkit/locales/en-US/toolkit/about/aboutTelemetryMullvad.ftl deleted ===================================== @@ -1,7 +0,0 @@ -# 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/. - - -telemetry-title = Telemetry Information -telemetry-description = Telemetry is disabled in { -brand-short-name }.

===================================== browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl → toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl ===================================== @@ -1,3 +1,18 @@ +# 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/. + +## About Mullvad browser dialog. + +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 +# Variables +# $emailAddress (String) - The email address of Mullvad's support +mullvad-about-feedback2 = Help & feedback: { $emailAddress } +mullvad-about-telemetryLink = Telemetry + +## Mullvad browser home page. + about-mullvad-browser-heading = { -brand-product-name } about-mullvad-browser-developed-by = Developed in collaboration between the <a data-l10n-name="tor-project-link">Tor Project</a> and <a data-l10n-name="mullvad-vpn-link">Mullvad VPN</a> about-mullvad-browser-use-vpn = Get more privacy by using the browser <a data-l10n-name="with-vpn-link">with Mullvad VPN</a>. @@ -8,6 +23,21 @@ about-mullvad-browser-learn-more = Curious to learn more about the browser? <a d # $version (String) - The new browser version. about-mullvad-browser-update-message = { -brand-short-name } has been updated to { $version }. <a data-l10n-name="update-link">See what’s new</a>

-## Deprecated. To be removed when 13.5 becomes stable. +## Home preferences. + +home-mode-choice-mullvad = + .label = { -brand-product-name } Home + +## about:rights page. + +rights-mullvad-intro = { -brand-short-name } is free and open source software. +rights-mullvad-you-should-know = There are a few things you should know: +rights-mullvad-trademarks = + You are not granted any trademark rights or licenses to the trademarks of + the { -brand-short-name } or any party, including without limitation the + { -brand-short-name } name or logo. + +## about:telemetry page.

-about-mullvad-browser-page-title = { -brand-product-name } Home +telemetry-title = Telemetry Information +telemetry-description = Telemetry is disabled in { -brand-short-name }.

===================================== tools/lint/fluent-lint/exclusions.yml ===================================== @@ -87,7 +87,6 @@ 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

View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/564...