This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new 3bdd401b684a fixup! Bug 10760: Integrate TorButton to TorBrowser core 3bdd401b684a is described below

commit 3bdd401b684aac0e7b53a1ea0739bf8736b67b38 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Nov 30 11:45:28 2022 +0100

fixup! Bug 10760: Integrate TorButton to TorBrowser core

Bug 41498: The Help panel is empty in 12.0a4 --- browser/base/content/browser-menubar.inc | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index dad713362661..eaf4aeb4a68c 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -472,44 +472,48 @@ label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/> <!-- Bug 18905: Hide unused help menu items --> - <!-- <menuitem id="menu_openHelp" + <menuitem id="menu_openHelp" oncommand="openHelpLink('firefox-help')" + hidden="true" data-l10n-id="menu-get-help" appmenu-data-l10n-id="appmenu-get-help" #ifdef XP_MACOSX key="key_openHelpMac"/> --> #else - /> --> + /> #endif - <!-- <menuitem id="feedbackPage" + <menuitem id="feedbackPage" oncommand="openFeedbackPage()" + hidden="true" data-l10n-id="menu-help-feedback-page" - appmenu-data-l10n-id="appmenu-help-feedback-page"/> --> - <!-- <menuitem id="helpSafeMode" + appmenu-data-l10n-id="appmenu-help-feedback-page"/> + <menuitem id="helpSafeMode" oncommand="safeModeRestart();" + hidden="true" data-l10n-id="menu-help-enter-troubleshoot-mode2" - appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/> --> - <!-- <menuitem id="troubleShooting" + appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/> + <menuitem id="troubleShooting" oncommand="openTroubleshootingPage()" + hidden="true" data-l10n-id="menu-help-more-troubleshooting-info" - appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/> --> + appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/> <menuitem id="help_reportSiteIssue" oncommand="ReportSiteIssue();" data-l10n-id="menu-help-report-site-issue" appmenu-data-l10n-id="appmenu-help-report-site-issue" hidden="true"/> - <!-- <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" + <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" disabled="true" oncommand="openUILink(gSafeBrowsing.getReportURL('Phish'), event, {triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({})});" hidden="true" data-l10n-id="menu-help-report-deceptive-site" - appmenu-data-l10n-id="appmenu-help-report-deceptive-site"/> --> - <!-- <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" + appmenu-data-l10n-id="appmenu-help-report-deceptive-site"/> + <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" disabled="true" oncommand="ReportFalseDeceptiveSite();" data-l10n-id="menu-help-not-deceptive" appmenu-data-l10n-id="appmenu-help-not-deceptive" - hidden="true"/> --> + hidden="true"/> <menuseparator id="aboutSeparator"/> <menuitem id="aboutName" oncommand="openAboutDialog();"