[iceweasel]: upgrade to v110.0

1 files changed, 20 insertions, 8 deletions

diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index 63330af9c..3af88e682 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] FSDG: Replace upstream default bookmarks
  1 file changed, 21 insertions(+), 29 deletions(-)
 
 diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html
-index b2d18d3098..e2e643bcf2 100644
+index c42e81ac23..e2e643bcf2 100644
 --- a/browser/base/content/default-bookmarks.html
 +++ b/browser/base/content/default-bookmarks.html
 @@ -1,14 +1,14 @@
@@ -35,26 +35,36 @@ index b2d18d3098..e2e643bcf2 100644
  <!-- This Source Code Form is subject to the terms of the Mozilla Public
     - License, v. 2.0. If a copy of the MPL was not distributed with this
     - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-@@ -29,31 +29,23 @@
+@@ -29,41 +29,23 @@
  <dl><p>
      <dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">default-bookmarks-toolbarfolder</h3></dt>
      <dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>
 -#ifndef NIGHTLY_BUILD
+-#ifdef EARLY_BETA_OR_EARLIER
          <dl><p>
 -            <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>
 +            <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>
          </dl><p>
--    <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>
+-#else
 +    <dt><h3>Parabola GNU/Linux-libre</h3></dt>
          <dl><p>
+-            <dt><a href="https://www.mozilla.org/firefox/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users&utm_content=-global" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>
+-        </dl><p>
+-#endif
+-    <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>
+-        <dl><p>
 -            <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>
 -            <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>
+-#ifdef EARLY_BETA_OR_EARLIER
+-            <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-beta&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
+-#else
 -            <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
+-#endif
 -            <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>
 -        </dl><p>
 -#else
 -        <dl><p>
--            <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
+-            <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-nightly&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
 -        </dl><p>
 -    <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>
 +            <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>
@@ -1101,7 +1111,7 @@ index 7d37d26..4ebbc06 100644
  
    <vbox id="hasFxaAccount">
 diff --git a/browser/locales/en-US/browser/branding/brandings.ftl b/browser/locales/en-US/browser/branding/brandings.ftl
-index efba683d66..9fe12b80fa 100644
+index a52cde5532..251acad0f8 100644
 --- a/browser/locales/en-US/browser/branding/brandings.ftl
 +++ b/browser/locales/en-US/browser/branding/brandings.ftl
 @@ -15,28 +15,28 @@
@@ -1122,12 +1132,13 @@ index efba683d66..9fe12b80fa 100644
  -mozilla-vpn-brand-name = Mozilla VPN
 --profiler-brand-name = Firefox Profiler
 --translations-brand-name = Firefox Translations
+--focus-brand-name = Firefox Focus
+--relay-brand-name = Firefox Relay
 +-profiler-brand-name = Iceweasel Profiler
 +-translations-brand-name = Iceweasel Translations
- -rally-brand-name = Mozilla Rally
- -rally-short-name = Rally
---focus-brand-name = Firefox Focus
 +-focus-brand-name = Iceweasel Focus
++-relay-brand-name = Iceweasel Relay
+ -relay-brand-short-name = Relay
  
 -# “Suggest” can be localized, “Firefox” must be treated as a brand
 +# “Suggest” can be localized, “Iceweasel” must be treated as a brand
@@ -1146,6 +1157,7 @@ index efba683d66..9fe12b80fa 100644
  # and kept in English.
 --firefoxview-brand-name = Firefox View
 +-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
 --- a/browser/locales/en-US/browser/preferences/preferences.ftl