From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 browser/base/content/main-popupset.inc.xhtml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'browser/base/content/main-popupset.inc.xhtml')

diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
index 4074f35ffc..bff8d98b27 100644
--- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml
@@ -36,10 +36,10 @@
     <menuitem id="context_bookmarkSelectedTabs"
               hidden="true"
               data-lazy-l10n-id="bookmark-selected-tabs"
-              oncommand="PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.uniqueSelectedPages);"/>
+              oncommand="PlacesCommandHook.bookmarkTabs(gBrowser.selectedTabs);"/>
     <menuitem id="context_bookmarkTab"
               data-lazy-l10n-id="tab-context-bookmark-tab"
-              oncommand="PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.getUniquePages([TabContextMenu.contextTab]));"/>
+              oncommand="PlacesCommandHook.bookmarkTabs([TabContextMenu.contextTab]);"/>
     <menu id="context_moveTabOptions"
           data-lazy-l10n-id="tab-context-move-tabs"
           data-l10n-args='{"tabCount": 1}'>
@@ -326,11 +326,11 @@
               data-lazy-l10n-id="toolbar-context-menu-reload-selected-tabs"/>
     <menuitem id="toolbar-context-bookmarkSelectedTab"
               contexttype="tabbar"
-              oncommand="PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.uniqueSelectedPages);"
+              oncommand="PlacesCommandHook.bookmarkTabs(gBrowser.selectedTabs);"
               data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tab"/>
     <menuitem id="toolbar-context-bookmarkSelectedTabs"
               contexttype="tabbar"
-              oncommand="PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.uniqueSelectedPages);"
+              oncommand="PlacesCommandHook.bookmarkTabs(gBrowser.selectedTabs);"
               data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tabs"/>
     <menuitem id="toolbar-context-selectAllTabs"
               contexttype="tabbar"
@@ -496,7 +496,8 @@
 #include ../../components/controlcenter/content/permissionPanel.inc.xhtml
 #include ../../components/controlcenter/content/protectionsPanel.inc.xhtml
 #include ../../components/downloads/content/downloadsPanel.inc.xhtml
-#include ../../components/translations/content/translationsPanel.inc.xhtml
+#include ../../components/translations/content/selectTranslationsPanel.inc.xhtml
+#include ../../components/translations/content/fullPageTranslationsPanel.inc.xhtml
 #include browser-allTabsMenu.inc.xhtml
 
   <tooltip id="dynamic-shortcut-tooltip"
@@ -624,38 +625,38 @@
   </menupopup>
 
   <menupopup id="translations-panel-settings-menupopup"
-             onpopupshown="TranslationsPanel.handleSettingsPopupShownEvent()"
-             onpopuphidden="TranslationsPanel.handleSettingsPopupHiddenEvent()">
+             onpopupshown="FullPageTranslationsPanel.handleSettingsPopupShownEvent()"
+             onpopuphidden="FullPageTranslationsPanel.handleSettingsPopupHiddenEvent()">
     <menuitem class="always-offer-translations-menuitem"
               data-l10n-id="translations-panel-settings-always-offer-translation"
               type="checkbox"
               checked="false"
               autocheck="false"
-              oncommand="TranslationsPanel.onAlwaysOfferTranslations()"/>
+              oncommand="FullPageTranslationsPanel.onAlwaysOfferTranslations()"/>
     <menuitem class="always-translate-language-menuitem"
               data-l10n-id="translations-panel-settings-always-translate-unknown-language"
               type="checkbox"
               checked="false"
               autocheck="false"
-              oncommand="TranslationsPanel.onAlwaysTranslateLanguage()"/>
+              oncommand="FullPageTranslationsPanel.onAlwaysTranslateLanguage()"/>
     <menuitem class="never-translate-language-menuitem"
               data-l10n-id="translations-panel-settings-never-translate-unknown-language"
               type="checkbox"
               checked="false"
               autocheck="false"
-              oncommand="TranslationsPanel.onNeverTranslateLanguage()"/>
+              oncommand="FullPageTranslationsPanel.onNeverTranslateLanguage()"/>
     <menuseparator/>
     <menuitem class="never-translate-site-menuitem"
               data-l10n-id="translations-panel-settings-never-translate-site"
               type="checkbox"
               checked="false"
               autocheck="false"
-              oncommand="TranslationsPanel.onNeverTranslateSite()"/>
+              oncommand="FullPageTranslationsPanel.onNeverTranslateSite()"/>
     <menuseparator/>
     <menuitem class="manage-languages-menuitem"
               data-l10n-id="translations-panel-settings-manage-languages"
-              oncommand="TranslationsPanel.openManageLanguages()"/>
+              oncommand="FullPageTranslationsPanel.openManageLanguages()"/>
     <menuitem data-l10n-id="translations-panel-settings-about2"
-              oncommand="TranslationsPanel.onAboutTranslations()"/>
+              oncommand="FullPageTranslationsPanel.onAboutTranslations()"/>
   </menupopup>
 </popupset>
-- 
cgit v1.2.3