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

Commits:

4 changed files:

Changes:

  • browser/components/preferences/config/about-firefox.mjs
    ... ... @@ -568,14 +568,6 @@ SettingGroupManager.registerGroups({
    568 568
                 control: "moz-box-link",
    
    569 569
                 supportPage: "preferences",
    
    570 570
               },
    
    571
    -          {
    
    572
    -            id: "supportShareIdeas",
    
    573
    -            l10nId: "support-share-ideas",
    
    574
    -            control: "moz-box-link",
    
    575
    -            controlAttrs: {
    
    576
    -              href: "https://connect.mozilla.org/",
    
    577
    -            },
    
    578
    -          },
    
    579 571
             ],
    
    580 572
           },
    
    581 573
         ],
    

  • browser/components/preferences/config/search.mjs
    ... ... @@ -1159,53 +1159,6 @@ SettingGroupManager.registerGroups({
    1159 1159
           },
    
    1160 1160
         ],
    
    1161 1161
       },
    
    1162
    -  searchSuggestions: {
    
    1163
    -    l10nId: "search-suggestions-header-2",
    
    1164
    -    headingLevel: 2,
    
    1165
    -    items: [
    
    1166
    -      // Add a warning banner. tor-browser#44629.
    
    1167
    -      {
    
    1168
    -        id: "searchSuggestionsWarningBanner",
    
    1169
    -        l10nId: "search-suggestions-warning-banner",
    
    1170
    -        control: "moz-message-bar",
    
    1171
    -        controlAttrs: {
    
    1172
    -          role: "status",
    
    1173
    -          type: "warning",
    
    1174
    -        },
    
    1175
    -      },
    
    1176
    -      {
    
    1177
    -        id: "suggestionsInSearchFieldsCheckbox",
    
    1178
    -        l10nId: "search-show-suggestions-option",
    
    1179
    -        items: [
    
    1180
    -          {
    
    1181
    -            id: "urlBarSuggestionCheckbox",
    
    1182
    -            l10nId: "search-show-suggestions-url-bar-option",
    
    1183
    -          },
    
    1184
    -          {
    
    1185
    -            id: "showSearchSuggestionsFirstCheckbox",
    
    1186
    -            l10nId: "search-show-suggestions-above-history-option-2",
    
    1187
    -          },
    
    1188
    -          {
    
    1189
    -            id: "showSearchSuggestionsPrivateWindowsCheckbox",
    
    1190
    -            l10nId: "search-show-suggestions-private-windows-2",
    
    1191
    -          },
    
    1192
    -          {
    
    1193
    -            id: "showTrendingSuggestionsCheckbox",
    
    1194
    -            l10nId: "addressbar-locbar-showtrendingsuggestions-option-2",
    
    1195
    -            supportPage: "google-trending-searches-on-awesomebar",
    
    1196
    -          },
    
    1197
    -          {
    
    1198
    -            id: "urlBarSuggestionPermanentPBMessage",
    
    1199
    -            l10nId: "search-suggestions-cant-show-2",
    
    1200
    -            control: "moz-message-bar",
    
    1201
    -            controlAttrs: {
    
    1202
    -              role: "status",
    
    1203
    -            },
    
    1204
    -          },
    
    1205
    -        ],
    
    1206
    -      },
    
    1207
    -    ],
    
    1208
    -  },
    
    1209 1162
       firefoxSuggest: {
    
    1210 1163
         id: "locationBarGroup",
    
    1211 1164
         subcategory: "locationBar",
    

  • browser/components/preferences/config/tabs-browsing.mjs
    ... ... @@ -661,25 +661,6 @@ SettingGroupManager.registerGroups({
    661 661
               },
    
    662 662
             ],
    
    663 663
           },
    
    664
    -      {
    
    665
    -        id: "browserContainersbox",
    
    666
    -        control: "moz-fieldset",
    
    667
    -        l10nId: "tabs-containers-heading",
    
    668
    -        headingLevel: 3,
    
    669
    -        items: [
    
    670
    -          {
    
    671
    -            id: "browserContainersCheckbox",
    
    672
    -            l10nId: "browser-containers-enabled-2",
    
    673
    -            supportPage: "containers",
    
    674
    -          },
    
    675
    -          {
    
    676
    -            id: "browserContainersSettings",
    
    677
    -            loadPane: "containers",
    
    678
    -            l10nId: "browser-containers-settings-2",
    
    679
    -            control: "moz-box-button",
    
    680
    -          },
    
    681
    -        ],
    
    682
    -      },
    
    683 664
           {
    
    684 665
             id: "tabsClosing",
    
    685 666
             control: "moz-fieldset",
    

  • toolkit/locales/en-US/toolkit/branding/brandings.ftl
    ... ... @@ -44,9 +44,9 @@
    44 44
     # and kept in English.
    
    45 45
     -firefox-suggest-brand-name = Firefox Suggest
    
    46 46
     
    
    47
    -# ”Home" can be localized, “Firefox” must be treated as a brand
    
    47
    +# ”Home" can be localized, “Mullvad” must be treated as a brand
    
    48 48
     # and kept in English.
    
    49
    --firefox-home-brand-name = Firefox Home
    
    49
    +-firefox-home-brand-name = Mullvad Home
    
    50 50
     
    
    51 51
     # View" can be localized, “Firefox” must be treated as a brand
    
    52 52
     # and kept in English.