libre/iceweasel: 115.0-1.parabola1

1 files changed, 66 insertions, 67 deletions

diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index 4d2680c6a..c6d8e92b1 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -129,22 +129,20 @@ index 76b495ea6c..d0c2b98b11 100644
  pref("browser.preferences.defaultPerformanceSettings.enabled", true);
  
 diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
-index 4c59b84a7c..44d36d3b28 100644
+index df8a1997a7..40696ea097 100644
 --- a/browser/base/content/test/static/browser_all_files_referenced.js
 +++ b/browser/base/content/test/static/browser_all_files_referenced.js
-@@ -136,17 +135,6 @@ var whitelist = [
+@@ -147,15 +147,6 @@ var whitelist = [
    // extensions/pref/autoconfig/src/nsReadConfig.cpp
    { file: "resource://gre/defaults/autoconfig/prefcalls.js" },
  
 -  // browser/components/preferences/moreFromMozilla.js
 -  // These files URLs are constructed programatically at run time.
 -  {
--    file:
--      "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",
+-    file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",
 -  },
 -  {
--    file:
--      "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",
+-    file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",
 -  },
 -
    { file: "resource://gre/greprefs.js" },
@@ -232,7 +230,7 @@ index 1208a5dbcd..ff91f7421e 100644
      if (BrowserUtils.shouldShowVPNPromo()) {
        const vpn = {
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index f6dc2b3781..34c7d8c528 100644
+index 115a67c962..3f9b72b021 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -10,7 +10,6 @@
@@ -243,23 +241,22 @@ index f6dc2b3781..34c7d8c528 100644
  /* import-globals-from findInPage.js */
  /* import-globals-from /browser/base/content/utilityOverlay.js */
  /* import-globals-from /toolkit/content/preferencesBindings.js */
-@@ -203,14 +202,6 @@ function init_all() {
+@@ -227,13 +226,6 @@ function init_all() {
      register_module("paneExperimental", gExperimentalPane);
    }
  
 -  NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true });
 -  if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) {
 -    document.getElementById("category-more-from-mozilla").hidden = false;
--    gMoreFromMozillaPane.option = NimbusFeatures.moreFromMozilla.getVariable(
--      "template"
--    );
+-    gMoreFromMozillaPane.option =
+-      NimbusFeatures.moreFromMozilla.getVariable("template");
 -    register_module("paneMoreFromMozilla", gMoreFromMozillaPane);
 -  }
    // The Sync category needs to be the last of the "real" categories
    // registered and inititalized since many tests wait for the
    // "sync-pane-loaded" observer notification before starting the test.
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 37544d2092..32b95bf95e 100644
+index a355a63d64..835cebe655 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -31,7 +31,6 @@
@@ -268,8 +265,8 @@ index 37544d2092..32b95bf95e 100644
    <link rel="localization" href="browser/preferences/fonts.ftl"/>
 -  <link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/>
    <link rel="localization" href="browser/preferences/preferences.ftl"/>
-   <link rel="localization" href="locales-preview/translations.ftl"/>
    <link rel="localization" href="toolkit/branding/accounts.ftl"/>
+   <link rel="localization" href="toolkit/branding/brandings.ftl"/>
 @@ -156,16 +155,6 @@
            <image class="category-icon"/>
            <label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>
@@ -311,7 +308,7 @@ for the same reasons as the original Firefox.
  browser/app/profile/firefox.js                |   2 +-
  .../static/browser_all_files_referenced.js    |   2 -
  .../newtab/lib/OnboardingMessageProvider.jsm  | 215 ------------------
- .../newtab/lib/PanelTestProvider.jsm          |  84 -------
+ .../newtab/lib/PanelTestProvider.sys.mjs          |  84 -------
  .../content/assets/focus-qr-code.svg          | 114 ----------
  .../content/assets/klar-qr-code.svg           | 114 ----------
  6 files changed, 1 insertion(+), 530 deletions(-)
@@ -319,38 +316,40 @@ for the same reasons as the original Firefox.
  delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index d0c2b98b11..54cc9de7e6 100644
+index d0eeab95fa..f69cab44a1 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g
+@@ -2013,7 +2013,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g
  pref("browser.promo.focus.disallowed_regions", "cn");
  
  // Default to enabling focus promos to be shown where allowed.
 -pref("browser.promo.focus.enabled", true);
 +pref("browser.promo.focus.enabled", false);
  
- // Comma separated string of mozilla vpn supported platforms.
- pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");
+ // Default to enabling pin promos to be shown where allowed.
+ pref("browser.promo.pin.enabled", true);
 diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
-index 44d36d3b28..6823855d56 100644
+index df8a1997a7..d3cafd9c7f 100644
 --- a/browser/base/content/test/static/browser_all_files_referenced.js
 +++ b/browser/base/content/test/static/browser_all_files_referenced.js
-@@ -32,8 +32,6 @@ var gExceptionPaths = [
-   "chrome://activity-stream/content/data/content/assets/remote/",
+@@ -35,8 +35,6 @@ var gExceptionPaths = [
+   "chrome://activity-stream/content/data/content/assets/person-typing.svg",
    "chrome://browser/content/assets/moz-vpn.svg",
    "chrome://browser/content/assets/vpn-logo.svg",
 -  "chrome://browser/content/assets/focus-promo.png",
 -  "chrome://browser/content/assets/klar-qr-code.svg",
  
-   // These app marketplace icons are referenced based on the user's locale
-   // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx
-diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+   // toolkit/components/pdfjs/content/build/pdf.js
+   "resource://pdf.js/web/images/",
+diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+index bcc02aba5f..6a36bfb797 100644
 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
 +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-@@ -649,321 +649,6 @@
+@@ -513,315 +513,6 @@ const BASE_MESSAGES = () => [
+       ],
      },
    },
-   {
+-  {
 -    id: "PB_NEWTAB_FOCUS_PROMO",
 -    type: "default",
 -    template: "pb_newtab",
@@ -403,8 +402,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
 -                    ios: {
 -                      action: {
 -                        data: {
--                          args:
--                            "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+-                          args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
 -                          where: "tabshifted",
 -                        },
 -                        type: "OPEN_URL",
@@ -414,8 +412,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
 -                    android: {
 -                      action: {
 -                        data: {
--                          args:
--                            "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+-                          args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
 -                          where: "tabshifted",
 -                        },
 -                        type: "OPEN_URL",
@@ -510,8 +507,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
 -                    ios: {
 -                      action: {
 -                        data: {
--                          args:
--                            "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
+-                          args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
 -                          where: "tabshifted",
 -                        },
 -                        type: "OPEN_URL",
@@ -521,8 +517,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
 -                    android: {
 -                      action: {
 -                        data: {
--                          args:
--                            "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
+-                          args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
 -                          where: "tabshifted",
 -                        },
 -                        type: "OPEN_URL",
@@ -613,8 +608,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
 -                    ios: {
 -                      action: {
 -                        data: {
--                          args:
--                            "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
+-                          args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
 -                          where: "tabshifted",
 -                        },
 -                        type: "OPEN_URL",
@@ -624,8 +618,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
 -                    android: {
 -                      action: {
 -                        data: {
--                          args:
--                            "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
+-                          args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
 -                          where: "tabshifted",
 -                        },
 -                        type: "OPEN_URL",
@@ -665,17 +658,18 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
 -    },
 -    targeting: "localeLanguageCode == 'de'",
 -  },
--  {
+   {
      id: "PB_NEWTAB_INFO_SECTION",
      template: "pb_newtab",
-     content: {
-diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm
---- a/browser/components/newtab/lib/PanelTestProvider.jsm
-+++ b/browser/components/newtab/lib/PanelTestProvider.jsm
-@@ -557,87 +557,6 @@
+diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
+index b5ff59290a..eb5fc60451 100644
+--- a/browser/components/newtab/lib/PanelTestProvider.sys.mjs
++++ b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
+@@ -367,85 +367,6 @@ const MESSAGES = () => [
+     frequency: { lifetime: 3 },
      trigger: { id: "defaultBrowserCheck" },
    },
-   {
+-  {
 -    id: "PB_FOCUS_PROMO",
 -    groups: ["panel-test-provider"],
 -    template: "spotlight",
@@ -705,8 +699,7 @@ diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/componen
 -            ios: {
 -              action: {
 -                data: {
--                  args:
--                    "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+-                  args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
 -                  where: "tabshifted",
 -                },
 -                type: "OPEN_URL",
@@ -716,8 +709,7 @@ diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/componen
 -            android: {
 -              action: {
 -                data: {
--                  args:
--                    "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+-                  args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
 -                  where: "tabshifted",
 -                },
 -                type: "OPEN_URL",
@@ -756,10 +748,9 @@ diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/componen
 -    },
 -    trigger: { id: "defaultBrowserCheck" },
 -  },
--  {
+   {
      id: "PB_NEWTAB_VPN_PROMO",
      template: "pb_newtab",
-     content: {
 diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg
 deleted file mode 100644
 index f182567314..0000000000
@@ -1086,7 +1077,7 @@ so this can still be a privacy concern.  BTW, POST is the default search
 method when searching directly from DDG HTML home page.
 
 2. Remove suspicious t=ffab URL parameter, because it can tell DDG that
-   this particular search extension is the origin of the search.`
+   this particular search extension is the origin of the search.
 
 Private search engine that doesn't track its users, huh?
 
@@ -1097,7 +1088,7 @@ Private search engine that doesn't track its users, huh?
  1 file changed, 5 insertions(+), 6 deletions(-)
 
 diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json
-index 56295197aa..475133c208 100644
+index 1e1bffed47..14b6cf9f5a 100644
 --- a/browser/components/search/extensions/ddg/manifest.json
 +++ b/browser/components/search/extensions/ddg/manifest.json
 @@ -1,6 +1,6 @@
@@ -1107,9 +1098,9 @@ index 56295197aa..475133c208 100644
 +  "name": "DuckDuckGo HTML",
 +  "description": "Search DuckDuckGo HTML",
    "manifest_version": 2,
-   "version": "1.3",
+   "version": "1.4",
    "browser_specific_settings": {
-@@ -18,10 +18,9 @@
+@@ -16,10 +16,9 @@
    "chrome_settings_overrides": {
      "search_provider": {
        "keyword": ["@duckduckgo", "@ddg"],
@@ -1221,11 +1212,11 @@ index a52cde5532..251acad0f8 100644
 +-firefoxview-brand-name = Iceweasel View
 
 diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
-index 1b29e8d..6f7566c 100644
+index 829c18c5e1..71c75114e9 100644
 --- a/browser/locales/en-US/browser/preferences/preferences.ftl
 +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
-@@ -714,16 +714,6 @@ sync-signedout-account-signin2 =
-     .label = Sign in to { -sync-brand-short-name }…
+@@ -838,16 +838,6 @@ sync-signedout-account-signin3 =
+     .label = Sign in to sync…
      .accesskey = i
  
 -# This message contains two links and two icon images.
@@ -1238,7 +1229,7 @@ index 1b29e8d..6f7566c 100644
 -# to your language, but should not be changed or translated.
 -sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.
 -
- ## Firefox Account - Signed in
+ ## Firefox account - Signed in
  
  sync-profile-picture =
 diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
@@ -1277,18 +1268,26 @@ index 5ac8a7b08c..fec81698e3 100644
  vpn-banner-header = Protection that extends beyond the browser
  # Note This text is not being translated, and the <br> will need to be removed if or when it does get translated
 diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
-index e33c814f62..5698f2b3e9 100644
+index 1374c30fd7..0d70747bf7 100644
 --- a/browser/components/protections/content/protections.html
 +++ b/browser/components/protections/content/protections.html
-@@ -303,8 +303,6 @@
-               </div>
-               <p class="content" data-l10n-id="vpn-header-content"></p>
-               <p class="content subscribed" data-l10n-id="vpn-header-content-subscribed">
--                <a target="_blank" id="vpn-google-playstore-link" data-l10n-name="vpn-google-playstore-link"></a>
--                <a target="_blank" id="vpn-app-store-link" data-l10n-name="vpn-app-store-link"></a>
+@@ -572,16 +572,6 @@
+                 class="content subscribed"
+                 data-l10n-id="vpn-header-content-subscribed"
+               >
+-                <a
+-                  target="_blank"
+-                  id="vpn-google-playstore-link"
+-                  data-l10n-name="vpn-google-playstore-link"
+-                ></a>
+-                <a
+-                  target="_blank"
+-                  id="vpn-app-store-link"
+-                  data-l10n-name="vpn-app-store-link"
+-                ></a>
                </p>
              </div>
-             <a target="_blank" id="get-vpn-link" data-l10n-id="get-vpn-link"></a>
+             <a
 diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs
 index 2417f1a641..698c48ccc3 100644
 --- a/browser/components/protections/content/vpn-card.mjs