From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:43:14 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 browser/base/content/main-popupset.inc.xhtml | 33 +++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 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 91b2483c53..ef8245938e 100644
--- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml
@@ -77,13 +77,16 @@
               data-lazy-l10n-id="tab-context-close-n-tabs"
               data-l10n-args='{"tabCount": 1}'
               oncommand="TabContextMenu.closeContextTabs();"/>
+    <menuitem id="context_closeDuplicateTabs"
+              data-lazy-l10n-id="tab-context-close-duplicate-tabs"
+              oncommand="gBrowser.removeDuplicateTabs(TabContextMenu.contextTab);"/>
     <menu id="context_closeTabOptions"
           data-lazy-l10n-id="tab-context-close-multiple-tabs">
       <menupopup id="closeTabOptions">
         <menuitem id="context_closeTabsToTheStart" data-lazy-l10n-id="close-tabs-to-the-start"
-                  oncommand="gBrowser.removeTabsToTheStartFrom(TabContextMenu.contextTab, {animate: true});"/>
+                  oncommand="gBrowser.removeTabsToTheStartFrom(TabContextMenu.contextTab);"/>
         <menuitem id="context_closeTabsToTheEnd" data-lazy-l10n-id="close-tabs-to-the-end"
-                  oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab, {animate: true});"/>
+                  oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab);"/>
         <menuitem id="context_closeOtherTabs" data-lazy-l10n-id="close-other-tabs"
                   oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
       </menupopup>
@@ -253,26 +256,26 @@
     <menuitem id="sidebar-switcher-bookmarks"
               data-l10n-id="sidebar-menu-bookmarks"
               key="viewBookmarksSidebarKb"
-              oncommand="SidebarUI.show('viewBookmarksSidebar');"/>
+              oncommand="SidebarController.show('viewBookmarksSidebar');"/>
     <menuitem id="sidebar-switcher-history"
               data-l10n-id="sidebar-menu-history"
               key="key_gotoHistory"
-              oncommand="SidebarUI.show('viewHistorySidebar');"/>
+              oncommand="SidebarController.show('viewHistorySidebar');"/>
     <menuitem id="sidebar-switcher-tabs"
               data-l10n-id="sidebar-menu-synced-tabs"
               class="sync-ui-item"
-              oncommand="SidebarUI.show('viewTabsSidebar');"/>
+              oncommand="SidebarController.show('viewTabsSidebar');"/>
     <menuitem id="sidebar-switcher-megalist"
               data-l10n-id="sidebar-menu-megalist"
-              oncommand="SidebarUI.show('viewMegalistSidebar');"/>
+              oncommand="SidebarController.show('viewMegalistSidebar');"/>
     <menuseparator/>
     <!-- Extension toolbarbuttons go here. -->
     <menuseparator id="sidebar-extensions-separator"/>
     <menuitem id="sidebar-reverse-position"
-              oncommand="SidebarUI.reversePosition()"/>
+              oncommand="SidebarController.reversePosition()"/>
     <menuseparator/>
     <menuitem data-l10n-id="sidebar-menu-close"
-              oncommand="SidebarUI.hide()"/>
+              oncommand="SidebarController.hide()"/>
   </menupopup>
 
   <menupopup id="toolbar-context-menu"
@@ -426,6 +429,10 @@
     <html:div class="tab-preview-text-container">
       <html:div class="tab-preview-title"></html:div>
       <html:div class="tab-preview-uri"></html:div>
+      <html:div class="tab-preview-pid-activeness">
+        <html:div class="tab-preview-pid"></html:div>
+        <html:div class="tab-preview-activeness"></html:div>
+      </html:div>
     </html:div>
     <html:div class="tab-preview-thumbnail-container"></html:div>
   </panel>
@@ -675,4 +682,14 @@
     <menuitem data-l10n-id="translations-panel-settings-about2"
               oncommand="FullPageTranslationsPanel.onAboutTranslations()"/>
   </menupopup>
+
+  <menupopup id="select-translations-panel-settings-menupopup">
+    <menuitem id="select-translations-panel-open-settings-page-menuitem"
+              class="manage-languages-menuitem"
+              data-l10n-id="select-translations-panel-open-translations-settings-menuitem"
+              oncommand="SelectTranslationsPanel.openTranslationsSettingsPage()"/>
+    <menuitem id="select-translations-panel-about-translations-menuitem"
+              data-l10n-id="translations-panel-settings-about2"
+              oncommand="SelectTranslationsPanel.onAboutTranslations()"/>
+  </menupopup>
 </popupset>
-- 
cgit v1.2.3