Merge branch 'ui-fixes'

assets/patches.txt

@@ -14,6 +14,7 @@ patches/sed-patches/stop-undesired-requests.patch
 patches/ui-patches/hide-default-browser.patch
 patches/ui-patches/pref-naming.patch
 patches/ui-patches/privacy-preferences.patch
+patches/ui-patches/remap-links.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/hide-default-browser.patch

@@ -2,7 +2,11 @@ diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/
 index 855ee64..617911a 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
-@@ -32,7 +32,7 @@
+@@ -29,6 +29,7 @@
+   <vbox id="startupPageBox">
+     <checkbox id="browserRestoreSession"
+               data-l10n-id="startup-restore-windows-and-tabs"/>
++    <label id="sessionRestoreLearnMore" is="text-link" class="learnMore" data-l10n-id="session-restore-learn-more"/>
    </vbox>
  
  #ifdef HAVE_SHELL_SERVICE

patches/ui-patches/pref-naming.patch

@@ -1,11 +1,20 @@
 --- a/browser/locales/en-US/browser/preferences/preferences.ftl
 +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
+@@ -128,6 +128,8 @@
+ 
+ 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
 @@ -140,7 +140,7 @@
      .accesskey = D
  
  startup-restore-windows-and-tabs =
 -    .label = Open previous windows and tabs
-+    .label = Open previous windows and tabs. (requires enabling browsing history)
++    .label = Open previous windows and tabs. <a data-l10n-name="learn-more">What if it does not work?</a>
      .accesskey = s
  
  startup-restore-warn-on-quit =

patches/ui-patches/remap-links.patch

@@ -0,0 +1,112 @@
+--- a/browser/components/preferences/main.js
++++ b/browser/components/preferences/main.js
+@@ -311,6 +311,14 @@
+       "performance";
+     performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
+ 
++    let sessionRestoreLink = document.getElementById(
++      "sessionRestoreLearnMore"
++    );
++    let sessionRestoreUrl =
++      Services.urlFormatter.formatURLPref("app.support.baseURL") +
++      "why-is-session-restore-not-working";
++      sessionRestoreLink.setAttribute("href", sessionRestoreUrl);
++
+     this.updateDefaultPerformanceSettingsPref();
+ 
+     let defaultPerformancePref = Preferences.get(
+@@ -542,7 +550,7 @@
+ 
+     let drmInfoURL =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "drm-content";
++      "how-do-i-enable-drm";
+     document
+       .getElementById("playDRMContentLink")
+       .setAttribute("href", drmInfoURL);
+@@ -869,7 +877,8 @@
+ 
+     const link = document.getElementById("browserContainersLearnMore");
+     link.href =
+-      Services.urlFormatter.formatURLPref("app.support.baseURL") + "containers";
++      Services.urlFormatter.formatURLPref("app.support.baseURL") +
++      "why-isnt-first-party-isolate-enabled-by-default";
+ 
+     document.getElementById("browserContainersbox").hidden = false;
+     this.readBrowserContainersCheckbox();
+--- a/browser/components/preferences/privacy.js
++++ b/browser/components/preferences/privacy.js
+@@ -282,7 +282,7 @@
+   let links = document.querySelectorAll(".contentBlockWarningLink");
+   let contentBlockingWarningUrl =
+     Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-    "turn-off-etp-desktop";
++    "what-is-mozilla-tracking-protection";
+   for (let link of links) {
+     link.setAttribute("href", contentBlockingWarningUrl);
+   }
+@@ -477,7 +477,7 @@
+     let link = document.getElementById("httpsOnlyLearnMore");
+     let httpsOnlyURL =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "https-only-prefs";
++      "does-librewolf-use-https-only-mode";
+     link.setAttribute("href", httpsOnlyURL);
+ 
+     // Set radio-value based on the pref value
+@@ -643,7 +643,7 @@
+     );
+     const breachAlertsLearnMoreUrl =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "lockwise-alerts";
++      "why-is-the-built-in-password-manager-disabled";
+     breachAlertsLearnMoreLink.setAttribute("href", breachAlertsLearnMoreUrl);
+ 
+     this._initSafeBrowsing();
+@@ -750,7 +750,7 @@
+     );
+     let url =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "storage-permissions";
++      "how-do-i-stay-logged-into-specific-websites";
+     document.getElementById("siteDataLearnMoreLink").setAttribute("href", url);
+ 
+     let notificationInfoURL =
+@@ -923,7 +923,7 @@
+     let link = document.getElementById("contentBlockingLearnMore");
+     let contentBlockingUrl =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "enhanced-tracking-protection";
++      "what-is-mozilla-tracking-protection";
+     link.setAttribute("href", contentBlockingUrl);
+ 
+     // Toggles the text "Cross-site and social media trackers" based on the
+@@ -2268,7 +2268,7 @@
+     let learnMoreLink = document.getElementById("primaryPasswordLearnMoreLink");
+     let learnMoreURL =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "primary-password-stored-logins";
++      "why-is-the-built-in-password-manager-disabled";
+     learnMoreLink.setAttribute("href", learnMoreURL);
+   },
+ 
+@@ -2466,7 +2466,7 @@
+     let learnMoreLink = document.getElementById("enableSafeBrowsingLearnMore");
+     let phishingUrl =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "phishing-malware";
++      "why-do-you-disable-google-safe-browsing";
+     learnMoreLink.setAttribute("href", phishingUrl);
+ 
+     enableSafeBrowsing.addEventListener("command", function() {
+--- a/toolkit/mozapps/extensions/content/aboutaddons.js
++++ b/toolkit/mozapps/extensions/content/aboutaddons.js
+@@ -1997,7 +1997,7 @@
+       icon: "chrome://global/skin/icons/help.svg",
+       createLinkElement: () => {
+         let link = document.createElement("a", { is: "support-link" });
+-        link.setAttribute("support-page", "addons-help");
++        link.setAttribute("support-page", "do-you-recommend-using-any-extensions");
+         link.id = "help-button";
+         return link;
+       },