[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] 3 commits: fixup! Mullvad Browser strings



Title: GitLab

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser

Commits:

  • 1c53419e
    by Henry Wilkes at 2026-01-19T15:40:24+00:00
    fixup! Mullvad Browser strings
    
    MB 489: Drop about:rights strings.
    
  • d4dac903
    by Henry Wilkes at 2026-01-19T15:40:26+00:00
    fixup! MB 63: Customize some about pages for Mullvad Browser
    
    MB 489: Drop about:rights for mullvad browser.
    
  • 29183696
    by Henry Wilkes at 2026-01-19T15:40:29+00:00
    BB 43901: Modify about:license.
    
    We also drop about:rights.
    

7 changed files:

Changes:

  • browser/base/moz.build
    ... ... @@ -79,7 +79,8 @@ PERFTESTS_MANIFESTS += ["content/test/perftest.toml"]
    79 79
     DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"]
    
    80 80
     DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
    
    81 81
     
    
    82
    -DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
    
    82
    +# Do not include the Firefox app-license.html in about:license.
    
    83
    +# tor-browser#43901.
    
    83 84
     
    
    84 85
     if CONFIG["BASE_BROWSER_UPDATE"]:
    
    85 86
         DEFINES["BASE_BROWSER_UPDATE"] = True
    

  • browser/components/about/AboutRedirector.cpp
    ... ... @@ -97,9 +97,7 @@ static const RedirEntry kRedirMap[] = {
    97 97
         {"profiling",
    
    98 98
          "chrome://devtools/content/performance-new/aboutprofiling/index.html",
    
    99 99
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
    
    100
    -    {"rights", "chrome://global/content/aboutRights.xhtml",
    
    101
    -     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    
    102
    -         nsIAboutModule::URI_MUST_LOAD_IN_CHILD},
    
    100
    +// Drop about:rights. tor-browser#43901.
    
    103 101
     #ifndef BASE_BROWSER_VERSION
    
    104 102
         {"robots", "chrome://browser/content/aboutRobots.xhtml",
    
    105 103
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    

  • browser/components/about/components.conf
    ... ... @@ -23,7 +23,7 @@ pages = [
    23 23
         'profiling',
    
    24 24
         'reader',
    
    25 25
         'restartrequired',
    
    26
    -    'rights',
    
    26
    +    # Removed 'rights'. tor-browser#43901.
    
    27 27
         # Removed 'robots'. tor-browser#42831.
    
    28 28
         'sessionrestore',
    
    29 29
         'settings',
    

  • toolkit/content/aboutRightsMullvad.xhtml deleted
    1
    -<?xml version="1.0" encoding="UTF-8"?>
    
    2
    -<!DOCTYPE html [ <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    
    3
    -%htmlDTD; ]>
    
    4
    -
    
    5
    -<!-- This Source Code Form is subject to the terms of the Mozilla Public
    
    6
    -   - License, v. 2.0. If a copy of the MPL was not distributed with this
    
    7
    -   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    
    8
    -
    
    9
    -<html xmlns="http://www.w3.org/1999/xhtml">
    
    10
    -  <head>
    
    11
    -    <meta
    
    12
    -      http-equiv="Content-Security-Policy"
    
    13
    -      content="default-src chrome:; object-src 'none'"
    
    14
    -    />
    
    15
    -    <meta name="color-scheme" content="light dark" />
    
    16
    -    <title data-l10n-id="rights-title"></title>
    
    17
    -    <link
    
    18
    -      rel="stylesheet"
    
    19
    -      href="">"chrome://global/skin/in-content/info-pages.css"
    
    20
    -      type="text/css"
    
    21
    -    />
    
    22
    -    <link rel="localization" href="">"branding/brand.ftl" />
    
    23
    -    <link rel="localization" href="">"toolkit/about/aboutRights.ftl" />
    
    24
    -    <link rel="localization" href="">"toolkit/global/mullvad-browser.ftl" />
    
    25
    -  </head>
    
    26
    -
    
    27
    -  <body id="your-rights" class="aboutPageWideContainer">
    
    28
    -    <div class="container">
    
    29
    -      <h1 data-l10n-id="rights-title"></h1>
    
    30
    -
    
    31
    -      <p data-l10n-id="rights-mullvad-intro"></p>
    
    32
    -      <p data-l10n-id="rights-mullvad-you-should-know"></p>
    
    33
    -
    
    34
    -      <ul>
    
    35
    -        <li data-l10n-id="rights-intro-point-1">
    
    36
    -          <a
    
    37
    -            href="">"http://www.mozilla.org/MPL/"
    
    38
    -            data-l10n-name="mozilla-public-license-link"
    
    39
    -          ></a>
    
    40
    -        </li>
    
    41
    -        <li data-l10n-id="rights-mullvad-trademarks"></li>
    
    42
    -      </ul>
    
    43
    -    </div>
    
    44
    -  </body>
    
    45
    -</html>

  • toolkit/content/jar.mn
    ... ... @@ -212,5 +212,3 @@ toolkit.jar:
    212 212
        content/global/vendor/react-transition-group.js (vendor/react/react-transition-group.js)
    
    213 213
        content/global/vendor/redux.js (vendor/react/redux.js)
    
    214 214
        content/global/vendor/react-redux.js (vendor/react/react-redux.js)
    215
    -
    
    216
    -   content/global/aboutRights.xhtml           (aboutRightsMullvad.xhtml)

  • toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl
    ... ... @@ -27,15 +27,6 @@ about-mullvad-browser-update-message = { -brand-short-name } has been updated t
    27 27
     home-mode-choice-mullvad =
    
    28 28
         .label = { -brand-product-name } Home
    
    29 29
     
    
    30
    -## about:rights page.
    
    31
    -
    
    32
    -rights-mullvad-intro = { -brand-short-name } is free and open source software.
    
    33
    -rights-mullvad-you-should-know = There are a few things you should know:
    
    34
    -rights-mullvad-trademarks =
    
    35
    -    You are not granted any trademark rights or licenses to the trademarks of
    
    36
    -    the { -brand-short-name } or any party, including without limitation the
    
    37
    -    { -brand-short-name } name or logo.
    
    38
    -
    
    39 30
     ## about:telemetry page.
    
    40 31
     
    
    41 32
     telemetry-title = Telemetry Information
    

  • toolkit/themes/shared/aboutLicense.css
    ... ... @@ -5,13 +5,9 @@
    5 5
     /* License Illustration */
    
    6 6
     
    
    7 7
     .license-header {
    
    8
    -  background-image: url("chrome://global/skin/illustrations/about-license.svg");
    
    9
    -  background-repeat: no-repeat;
    
    10
    -  background-position: right center;
    
    11
    -  min-height: 300px;
    
    12
    -  display: flex;
    
    13
    -  align-items: center;
    
    14
    -  padding-inline-end: 320px;
    
    8
    +  /* Adjust the header to remove the background, which is out of place without
    
    9
    +   * the app-license.html content. */
    
    10
    +  align-self: start;
    
    15 11
     }
    
    16 12
     
    
    17 13
     td:nth-child(1),
    

  • _______________________________________________
    tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
    To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx