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
-
96e5e78f
by Henry Wilkes at 2024-10-01T09:26:26+01:00
-
e0227da3
by Henry Wilkes at 2024-10-01T09:26:27+01:00
-
6243c664
by Henry Wilkes at 2024-10-01T09:26:28+01:00
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:
... | ... | @@ -37,7 +37,7 @@ |
37 | 37 | <html:link rel="localization" href="branding/brand.ftl"/>
|
38 | 38 | <html:link rel="localization" href="browser/aboutDialog.ftl"/>
|
39 | 39 | <html:link rel="localization" href="toolkit/global/base-browser.ftl"/>
|
40 | - <html:link rel="localization" href="browser/aboutDialogMullvad.ftl"/>
|
|
40 | + <html:link rel="localization" href="toolkit/global/mullvad-browser.ftl"/>
|
|
41 | 41 | </linkset>
|
42 | 42 | |
43 | 43 | <html:div id="aboutDialogContainer">
|
... | ... | @@ -17,10 +17,7 @@ |
17 | 17 | />
|
18 | 18 | <link rel="localization" href="branding/brand.ftl" />
|
19 | 19 | <link rel="localization" href="browser/newtab/newtab.ftl" />
|
20 | - <link
|
|
21 | - rel="localization"
|
|
22 | - href="browser/mullvad-browser/aboutMullvadBrowser.ftl"
|
|
23 | - />
|
|
20 | + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" />
|
|
24 | 21 | |
25 | 22 | <script src="chrome://browser/content/mullvad-browser/aboutMullvadBrowser.js"></script>
|
26 | 23 | </head>
|
... | ... | @@ -80,7 +80,7 @@ |
80 | 80 | <link rel="localization" href="security/certificates/deviceManager.ftl"/>
|
81 | 81 | <link rel="localization" href="toolkit/updates/history.ftl"/>
|
82 | 82 | <link rel="localization" href="toolkit/global/base-browser.ftl"/>
|
83 | - <link rel="localization" href="browser/mullvad-browser/preferences.ftl"/>
|
|
83 | + <link rel="localization" href="toolkit/global/mullvad-browser.ftl"/>
|
|
84 | 84 | |
85 | 85 | <link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>
|
86 | 86 |
1 | -# This Source Code Form is subject to the terms of the Mozilla Public
|
|
2 | -# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3 | -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
4 | - |
|
5 | -## Variables
|
|
6 | -## $emailAddress (String) - The email address of Mullvad's support
|
|
7 | - |
|
8 | -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.
|
|
9 | -mullvad-about-readMore = Read more
|
|
10 | -mullvad-about-feedback2 = Help & feedback: { $emailAddress }
|
|
11 | -mullvad-about-telemetryLink = Telemetry |
1 | -home-mode-choice-mullvad =
|
|
2 | - .label = { -brand-product-name } Home |
... | ... | @@ -21,7 +21,7 @@ |
21 | 21 | />
|
22 | 22 | <link rel="localization" href="branding/brand.ftl" />
|
23 | 23 | <link rel="localization" href="toolkit/about/aboutRights.ftl" />
|
24 | - <link rel="localization" href="toolkit/about/aboutRightsMullvad.ftl" />
|
|
24 | + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" />
|
|
25 | 25 | </head>
|
26 | 26 | |
27 | 27 | <body id="your-rights" class="aboutPageWideContainer">
|
... | ... | @@ -20,7 +20,7 @@ |
20 | 20 | type="text/css"
|
21 | 21 | />
|
22 | 22 | <link rel="localization" href="branding/brand.ftl" />
|
23 | - <link rel="localization" href="toolkit/about/aboutTelemetryMullvad.ftl" />
|
|
23 | + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" />
|
|
24 | 24 | </head>
|
25 | 25 | |
26 | 26 | <body id="your-rights" class="aboutPageWideContainer">
|
1 | -# This Source Code Form is subject to the terms of the Mozilla Public
|
|
2 | -# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3 | -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
4 | - |
|
5 | -rights-mullvad-intro = { -brand-short-name } is free and open source software.
|
|
6 | -rights-mullvad-you-should-know = There are a few things you should know:
|
|
7 | -rights-mullvad-trademarks =
|
|
8 | - You are not granted any trademark rights or licenses to the trademarks of
|
|
9 | - the { -brand-short-name } or any party, including without limitation the
|
|
10 | - { -brand-short-name } name or logo. |
1 | -# This Source Code Form is subject to the terms of the Mozilla Public
|
|
2 | -# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3 | -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
4 | - |
|
5 | - |
|
6 | -telemetry-title = Telemetry Information
|
|
7 | -telemetry-description = Telemetry is disabled in { -brand-short-name }. |
1 | +# This Source Code Form is subject to the terms of the Mozilla Public
|
|
2 | +# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3 | +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
4 | + |
|
5 | +## About Mullvad browser dialog.
|
|
6 | + |
|
7 | +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.
|
|
8 | +mullvad-about-readMore = Read more
|
|
9 | +# Variables
|
|
10 | +# $emailAddress (String) - The email address of Mullvad's support
|
|
11 | +mullvad-about-feedback2 = Help & feedback: { $emailAddress }
|
|
12 | +mullvad-about-telemetryLink = Telemetry
|
|
13 | + |
|
14 | +## Mullvad browser home page.
|
|
15 | + |
|
1 | 16 | about-mullvad-browser-heading = { -brand-product-name }
|
2 | 17 | 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>
|
3 | 18 | 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 |
8 | 23 | # $version (String) - The new browser version.
|
9 | 24 | about-mullvad-browser-update-message = { -brand-short-name } has been updated to { $version }. <a data-l10n-name="update-link">See what’s new</a>
|
10 | 25 | |
11 | -## Deprecated. To be removed when 13.5 becomes stable.
|
|
26 | +## Home preferences.
|
|
27 | + |
|
28 | +home-mode-choice-mullvad =
|
|
29 | + .label = { -brand-product-name } Home
|
|
30 | + |
|
31 | +## about:rights page.
|
|
32 | + |
|
33 | +rights-mullvad-intro = { -brand-short-name } is free and open source software.
|
|
34 | +rights-mullvad-you-should-know = There are a few things you should know:
|
|
35 | +rights-mullvad-trademarks =
|
|
36 | + You are not granted any trademark rights or licenses to the trademarks of
|
|
37 | + the { -brand-short-name } or any party, including without limitation the
|
|
38 | + { -brand-short-name } name or logo.
|
|
39 | + |
|
40 | +## about:telemetry page.
|
|
12 | 41 | |
13 | -about-mullvad-browser-page-title = { -brand-product-name } Home |
|
42 | +telemetry-title = Telemetry Information
|
|
43 | +telemetry-description = Telemetry is disabled in { -brand-short-name }. |
... | ... | @@ -87,7 +87,6 @@ ID01: |
87 | 87 | # The webext-perms-description-* IDs are generated programmatically
|
88 | 88 | # from permission names
|
89 | 89 | - toolkit/locales/en-US/toolkit/global/extensionPermissions.ftl
|
90 | - - browser/locales/en-US/browser/aboutDialogMullvad.ftl
|
|
91 | 90 | ID02:
|
92 | 91 | messages:
|
93 | 92 | # browser/components/ion/content/ion.ftl
|