Merge branch 'main' of gitlab.com:librewolf-community/browser/source

patches/remove_addons.patch

@@ -1,12 +1,8 @@
 diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
-index 0d4b9c3..d923333 100644
+index 3c6e7eb88689..d923333aa100 100644
 --- a/browser/extensions/moz.build
 +++ b/browser/extensions/moz.build
-@@ -5,11 +5,9 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- DIRS += [
--    "doh-rollout",
+@@ -8,7 +8,6 @@ DIRS += [
      "formautofill",
      "screenshots",
      "webcompat",
@@ -15,10 +11,10 @@ index 0d4b9c3..d923333 100644
      "search-detection",
  ]
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index e4b60a0..c38fdd2 100644
+index 7296ca447757..1278582e79d7 100644
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -55,7 +55,6 @@ l10n-%:
+@@ -56,7 +56,6 @@ l10n-%:
  ifneq (,$(wildcard ../extensions/formautofill/locales))
  	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
  endif
@@ -26,7 +22,7 @@ index e4b60a0..c38fdd2 100644
  	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
-@@ -76,7 +75,6 @@ endif
+@@ -78,7 +77,6 @@ endif
  	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
  	@$(MAKE) chrome AB_CD=$*
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
@@ -35,7 +31,7 @@ index e4b60a0..c38fdd2 100644
  package-win32-installer: $(SUBMAKEFILES)
  	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
 diff --git a/browser/locales/filter.py b/browser/locales/filter.py
-index 22eb5cb..5e1f09f 100644
+index 22eb5cbdb177..5e1f09ff383e 100644
 --- a/browser/locales/filter.py
 +++ b/browser/locales/filter.py
 @@ -17,7 +17,6 @@ def test(mod, path, entity=None):
@@ -47,7 +43,7 @@ index 22eb5cb..5e1f09f 100644
          "other-licenses/branding/firefox",
          "browser/branding/official",
 diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
-index 7a65997..7f97667 100644
+index 7a6599740b20..7f976679eefc 100644
 --- a/browser/locales/l10n.ini
 +++ b/browser/locales/l10n.ini
 @@ -13,7 +13,6 @@ dirs = browser
@@ -59,7 +55,7 @@ index 7a65997..7f97667 100644
  [includes]
  # non-central apps might want to use %(topsrcdir)s here, or other vars
 diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
-index e9d5010..914a2f1 100644
+index e9d50107cb10..914a2f1a6310 100644
 --- a/browser/locales/l10n.toml
 +++ b/browser/locales/l10n.toml
 @@ -133,10 +133,6 @@ locales = [
@@ -73,3 +69,6 @@ index e9d5010..914a2f1 100644
  [[paths]]
      reference = "services/sync/locales/en-US/**"
      l10n = "{l}services/sync/**"
+-- 
+2.37.3
+

patches/ui-patches/pref-naming.patch

@@ -1,6 +1,8 @@
+diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
+index a1e414697e71..b69052923385 100644
 --- a/browser/locales/en-US/browser/preferences/preferences.ftl
 +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
-@@ -128,6 +128,8 @@
+@@ -128,6 +128,8 @@ search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-sho
  
  startup-header = Startup
  
@@ -9,7 +11,7 @@
  always-check-default =
      .label = Always check if { -brand-short-name } is your default browser
      .accesskey = y
-@@ -409,13 +409,13 @@
+@@ -469,13 +471,13 @@ play-drm-content =
      .label = Play DRM-controlled content
      .accesskey = P
  
@@ -25,27 +27,27 @@
  
  update-history =
      .label = Show Update History…
-@@ -568,7 +568,7 @@
- # "Firefox" should be treated as a brand and kept in English,
- # while "Home" and "(Default)" can be localized.
- home-mode-choice-default =
--    .label = Firefox Home (Default)
+@@ -634,7 +636,7 @@ home-restore-defaults =
+     .accesskey = R
+ 
+ home-mode-choice-default-fx =
+-    .label = { -firefox-home-brand-name } (Default)
 +    .label = Homepage (Default)
  
  home-mode-choice-custom =
      .label = Custom URLs…
-@@ -597,8 +597,8 @@
+@@ -663,8 +665,8 @@ choose-bookmark =
  
  ## Home Section - Firefox Home Content Customization
  
--home-prefs-content-header = Firefox Home Content
--home-prefs-content-description = Choose what content you want on your Firefox Home screen.
-+home-prefs-content-header = Homepage Content
-+home-prefs-content-description = Choose what content you want on your Homepage screen.
+-home-prefs-content-header2 = { -firefox-home-brand-name } Content
+-home-prefs-content-description2 = Choose what content you want on your { -firefox-home-brand-name } screen.
++home-prefs-content-header2 = Homepage Content
++home-prefs-content-description2 = Choose what content you want on your Homepage screen.
  
  home-prefs-search-header =
      .label = Web Search
-@@ -650,7 +650,7 @@
+@@ -709,7 +711,7 @@ home-prefs-recent-activity-description = A selection of recent sites and content
  home-prefs-snippets-header =
      .label = Snippets
  
@@ -54,4 +56,6 @@
  
  home-prefs-sections-rows-option =
      .label =
+-- 
+2.37.3