morgan pushed to branch mullvad-browser-153.0esr-16.0-1 at The Tor Project / Applications / Mullvad Browser

Commits:

4 changed files:

Changes:

  • browser/components/preferences/config/languages.mjs
    ... ... @@ -899,7 +899,9 @@ SettingGroupManager.registerGroups({
    899 899
       },
    
    900 900
       websiteLanguage: {
    
    901 901
         inProgress: true,
    
    902
    -    l10nId: "website-language-heading",
    
    902
    +    // Modify the description to remove any mention of choosing the order of
    
    903
    +    // languages. tor-browser#45176.
    
    904
    +    l10nId: "website-language-heading-no-preferred-order",
    
    903 905
         headingLevel: 2,
    
    904 906
         iconSrc: "chrome://global/skin/icons/defaultFavicon.svg",
    
    905 907
         items: [
    
    ... ... @@ -942,9 +944,14 @@ SettingGroupManager.registerGroups({
    942 944
               },
    
    943 945
             ],
    
    944 946
           },
    
    947
    +      {
    
    948
    +        id: "websiteSpoofEnglish",
    
    949
    +        l10nId: "languages-customize-spoof-english",
    
    950
    +      },
    
    945 951
         ],
    
    946 952
       },
    
    947
    -  websiteSpoofEnglish: {
    
    953
    +  // TODO: Remove once we switch to the new settings redesign. tor-browser#45177
    
    954
    +  websiteSpoofEnglishControl: {
    
    948 955
         items: [
    
    949 956
           {
    
    950 957
             id: "websiteSpoofEnglish",
    

  • browser/components/preferences/main.inc.xhtml
    ... ... @@ -105,7 +105,7 @@
    105 105
       </hbox>
    
    106 106
       <!-- TODO: Integrate into the "Languages" setting-group after bugzilla bug
    
    107 107
          - 1972081. -->
    
    108
    -  <html:setting-group groupid="websiteSpoofEnglish"></html:setting-group>
    
    108
    +  <html:setting-group groupid="websiteSpoofEnglishControl"></html:setting-group>
    
    109 109
     
    
    110 110
       <checkbox id="useSystemLocale" hidden="true"
    
    111 111
                 data-l10n-id="use-system-locale"
    

  • browser/components/preferences/main.js
    ... ... @@ -820,7 +820,7 @@ var gMainPane = {
    820 820
         initSettingGroup("fonts");
    
    821 821
         initSettingGroup("browserLanguage");
    
    822 822
         initSettingGroup("websiteLanguage");
    
    823
    -    initSettingGroup("websiteSpoofEnglish");
    
    823
    +    initSettingGroup("websiteSpoofEnglishControl");
    
    824 824
         initSettingGroup("browsing");
    
    825 825
         initSettingGroup("keyboardAndScrolling");
    
    826 826
         initSettingGroup("motionAndLink");
    

  • toolkit/locales/en-US/toolkit/global/base-browser.ftl
    ... ... @@ -122,6 +122,14 @@ preferences-contrast-control-fixed-color2 =
    122 122
         .accesskey = F
    
    123 123
         .description = This will be detectable by websites and will make you appear more unique to web trackers.
    
    124 124
     
    
    125
    +## Preferences - Language.
    
    126
    +
    
    127
    +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
    
    128
    +# This is modified from the "website-language-heading" string from Firefox. See Firefox's translation on Pontoon using the "LOCALES" tab: https://pontoon.mozilla.org/ar/firefox/browser/browser/preferences/preferences.ftl/?string=328899 .
    
    129
    +website-language-heading-no-preferred-order =
    
    130
    +    .label = Website language
    
    131
    +    .description = Some web pages are displayed in multiple languages. Choose how { -brand-short-name } should request them.
    
    132
    +
    
    125 133
     ## Security level toolbar button.
    
    126 134
     ## Uses sentence case in English (US).
    
    127 135
     ## ".label" is the accessible name, and shown in the overflow menu and when customizing the toolbar.