Move some patches to brandings.ftl

assets/patches.txt

@@ -25,10 +25,8 @@ patches/ui-patches/hide-default-browser.patch
 patches/ui-patches/lw-logo-devtools.patch
 patches/ui-patches/pref-naming.patch
 patches/ui-patches/privacy-preferences.patch
-patches/ui-patches/remove-branding-urlbar.patch
 patches/ui-patches/remove-cfrprefs.patch
 patches/ui-patches/remove-organization-policy-banner.patch
-patches/ui-patches/rename-firefox-labs.patch
 patches/ui-patches/website-appearance-ui-rfp.patch
 patches/urlbarprovider-interventions.patch
 patches/windows-theming-bug.patch

browser/preferences/preferences.ftl

@@ -1,3 +1,5 @@
+session-restore-learn-more = What if it does not work?
+
 ## LibreWolf preferences
 
 # Sidebar

l10n/en-US/toolkit/branding/brandings.ftl

@@ -0,0 +1,7 @@
+-screenshots-brand-name = Screenshots
+-profiler-brand-name = Profiler
+-translations-brand-name = Translations
+-firefox-suggest-brand-name = Suggestions
+-firefox-home-brand-name = Homepage
+-firefoxview-brand-name = Browser View
+-firefoxlabs-brand-name = Experimental Features

patches/ui-patches/pref-naming.patch

@@ -1,14 +1,5 @@
 --- a/browser/locales/en-US/browser/preferences/preferences.ftl
 +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
-@@ -142,6 +142,8 @@ search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-sho
- 
- startup-header = Startup
- 
-+session-restore-learn-more = What if it does not work?
-+
- always-check-default =
-     .label = Always check if { -brand-short-name } is your default browser
-     .accesskey = y
 @@ -489,7 +491,7 @@ play-drm-content =
      .label = Play DRM-controlled content
      .accesskey = P
@@ -27,23 +18,3 @@
  
  update-history =
      .label = Show Update History…
-@@ -664,7 +666,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…
-@@ -693,8 +695,8 @@ choose-bookmark =
- 
- ## Home Section - Firefox Home Content Customization
- 
--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

patches/ui-patches/remove-branding-urlbar.patch

@@ -1,11 +0,0 @@
---- a/browser/locales/en-US/browser/browser.ftl
-+++ b/browser/locales/en-US/browser/browser.ftl
-@@ -543,7 +543,7 @@ urlbar-result-action-search-tabs = Searc
- # A label shown above the "Firefox Suggest" (bookmarks/history) group in the
- # urlbar results.
- urlbar-group-firefox-suggest =
--  .label = { -firefox-suggest-brand-name }
-+  .label = Suggestions
- 
- # A label shown above the search suggestions group in the urlbar results. It
- # should use sentence case.

patches/ui-patches/rename-firefox-labs.patch

@@ -1,9 +0,0 @@
-diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
---- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
-+++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
-@@ -51,4 +51,4 @@
- # experimental and in-development features, and turn those features on and off.
- # The "Labs" portion can be localized, “Firefox” must be treated as a brand
- # and kept in English.
---firefoxlabs-brand-name = Firefox Labs
-+-firefoxlabs-brand-name = Experimental Features