Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

locales/ar/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = إعادة تعيين علامة التبويب المثبتة
     .accesskey = ر
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remove from Essentials

locales/ca/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Restableix la pestanya fixada
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Afegeix als essentials ({ $num }/12 espais ocupats)
+    .label = Afegeix als essentials ({ $num } / { $max } espais ocupats)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Elimina dels essencials

locales/cs/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Resetovat připnuté karty
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Přidat do Essentials ({ $num } / 12 zaplněných slotů)
+    .label = Přidat do Essentials ({ $num } / { $max } zaplněných slotů)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Odstranit z Essentials

locales/cy/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Ailosod Tab wedi'i Binio
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Diddymu o Hanfodion

locales/da/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Nulstil fastgjort fane
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Føj til Essentielle ({ $num } / 12 pladser fyldt)
+    .label = Føj til Essentielle ({ $num } / { $max } pladser fyldt)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Fjern fra Essentielle

locales/de/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Angepinnten Tab zurücksetzen
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Zu Essentials hinzufügen ({ $num } / 12 Plätze belegt)
+    .label = Zu Essentials hinzufügen ({ $num } / { $max } Plätze belegt)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Aus Essentials entfernen

locales/el/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Επαναφορά Καρφιτσωμένης Καρτέλας
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Προσθήκη στα Απαραίτητα ({ $num } / 12 θέσεις γεμάτες)
+    .label = Προσθήκη στα Απαραίτητα ({ $num } / { $max } θέσεις γεμάτες)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Αφαίρεση από Απαραίτητα

locales/en-GB/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remove from Essentials

locales/en-US/browser/browser/zen-general.ftl

@@ -6,7 +6,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remove from Essentials

locales/es-ES/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Restablecer pestaña fijada
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Añadir a esenciales ({ $num } / 12 huecos llenos)
+    .label = Añadir a esenciales ({ $num } / { $max } huecos llenos)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Quitar de esenciales

locales/et/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Lähtesta püsikaart
     .accesskey = p
 tab-context-zen-add-essential =
-    .label = Märgi oluliseks ({ $num } / 12 täidetud)
+    .label = Märgi oluliseks ({ $num } / { $max } täidetud)
     .accesskey = o
 tab-context-zen-remove-essential =
     .label = Eemalda olulistest

locales/fa/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remove from Essentials

locales/fi/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Nollaa Kiinnitetty Välilehti
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Poista olennaisista

locales/fr/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Réinitialiser l’onglet épinglé
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Ajouter aux Essentials ({ $num }/12 emplacements occupés)
+    .label = Ajouter aux Essentials ({ $num } / { $max } emplacements occupés)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Retirer des Essentials

locales/ga-IE/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Athshocraigh an Cluaisín Prionáilte
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Cuir le Bunriachtanais ({ $num } / 12 sliotán líonta)
+    .label = Cuir le Bunriachtanais ({ $num } / { $max } sliotán líonta)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Bain de na Bunriachtanais

locales/he/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = אפס כרטיסייה מוצמדת
     .accesskey = ר
 tab-context-zen-add-essential =
-    .label = הוסף לנחוצים ({ $num } / 12 מקומות מלאים)
+    .label = הוסף לנחוצים ({ $num } / { $max } מקומות מלאים)
     .accesskey = ק
 tab-context-zen-remove-essential =
     .label = הסר מנחוצים

locales/hu/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Kitűzött lap visszaállítása
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Felvétel az alapvetőkbe ({ $num } / 12 hely foglalt)
+    .label = Felvétel az alapvetőkbe ({ $num } / { $max } hely foglalt)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Eltávolítás az alapvetőkből

locales/id/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Kembalikan ke URL Awal
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Tambahkan ke Essentials ({ $num } / 12 slot terisi)
+    .label = Tambahkan ke Essentials ({ $num } / { $max } slot terisi)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Hapus dari Essentials

locales/is/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Endursetja Festan Flipa
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Fjarlægja frá Höfuðatriði

locales/it/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Reimposta Scheda Bloccata
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Aggiungi a Essentials ({ $num } / 12 slot riempiti)
+    .label = Aggiungi a Essentials ({ $num } / { $max } slot riempiti)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Rimuovi dagli Essenziali

locales/ja/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = ピン留めされたタブをリセット
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Essentialsから削除

locales/ko/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = 고정된 탭 초기화
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = 에센셜에 추가 ({ $num } / 12 개 추가됨)
+    .label = 에센셜에 추가 ({ $num } / { $max } 개 추가됨)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = 에센셜에서 제거하기

locales/lt/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Atkurti prisegtą kortelę
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Įtraukti į būtiniausius ({ $num } / 12 užpildytų vietų)
+    .label = Įtraukti į būtiniausius ({ $num } / { $max } užpildytų vietų)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Šalinti iš būtiniausių

locales/nl/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Vastgezette tabblad resetten
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Toevoegen aan Essentials ({ $num } / 12 plekken gevuld)
+    .label = Toevoegen aan Essentials ({ $num } / { $max } plekken gevuld)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Verwijderen uit Essentials

locales/nn-NO/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remove from Essentials

locales/pl/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Resetuj przypiętą kartę
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Dodaj do Niezbędnych ({ $num } / 12 miejsc wypełnione)
+    .label = Dodaj do Niezbędnych ({ $num } / { $max } miejsc wypełnione)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Usuń z Niezbędnych

locales/pt-BR/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Redefinir Guia Fixada
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Adicionar aos Essenciais ({ $num } / 12 espaços preenchidos)
+    .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remover dos Essenciais

locales/pt-PT/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Repor o Separador Fixado
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Adicionar aos Essenciais ({ $num }/12 espaços preenchidos)
+    .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remover dos Essenciais

locales/ru/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Сбросить закреплённую вкладку
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Добавить в важное ({ $num } из 12 слотов заполнено)
+    .label = Добавить в важное ({ $num } из { $num } слотов заполнено)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Удалить из важного

locales/sv-SE/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Återställ Fäst flik
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Lägg till Essentials ({ $num } / 12 platser fyllda)
+    .label = Lägg till Essentials ({ $num } / { $max } platser fyllda)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Ta bort från Essentials

locales/th/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remove from Essentials

locales/tr/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Sabitlenen Sekmeyi Sıfırla
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Temel Ögelerden Kaldır

locales/uk/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Скинути прикріплену вкладку
     .accesskey = Р
 tab-context-zen-add-essential =
-    .label = Додати до Основного ({ $num } / 12 комірок заповнено)
+    .label = Додати до Основного ({ $num } / { $max } комірок заповнено)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Вилучити з основних елементів

locales/vi/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Đặt lại thẻ đã ghim
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Thêm thẻ vào thường trú (đã thêm { $num } / 12 )
+    .label = Thêm thẻ vào thường trú (đã thêm { $num } / { $max } )
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Loại ra khỏi thẻ thường trú

locales/zh-CN/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = 重置固定标签页
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = 添加到常驻标签页（已使用 { $num } / 12）
+    .label = 添加到常驻标签页（已使用 { $num } / { $max }）
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = 从常驻标签页中移除

locales/zh-TW/browser/browser/zen-general.ftl

@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = 重置釘選的分頁
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = 從 Essentials 中移除

prefs/zen.yaml

@@ -11,6 +11,9 @@
 - name: zen.tabs.rename-tabs
   value: true
 
+- name: zen.tabs.essentials.max
+  value: 12
+
 - name: zen.tabs.show-newtab-vertical
   value: true
 

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -38,6 +38,12 @@
         'zen.pinned-tab-manager.close-shortcut-behavior',
         'switch'
       );
+      XPCOMUtils.defineLazyPreferenceGetter(
+        lazy,
+        'zenTabsEssentialsMax',
+        'zen.tabs.essentials.max',
+        12
+      );
       ChromeUtils.defineESModuleGetters(lazy, {
         E10SUtils: 'resource://gre/modules/E10SUtils.sys.mjs',
       });
@@ -68,8 +74,6 @@
   }
 
   class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
-    MAX_ESSENTIALS_TABS = 12;
-
     hasInitializedPins = false;
     promiseInitializedPinned = new Promise((resolve) => {
       this._resolvePinnedInitializedInternal = resolve;
@@ -140,6 +144,10 @@
       return !gZenWorkspaces.privateWindowOrDisabled;
     }
 
+    get maxEssentialTabs() {
+      return lazy.zenTabsEssentialsMax;
+    }
+
     async refreshPinnedTabs({ init = false } = {}) {
       if (!this.enabled) {
         return;
@@ -1055,7 +1063,7 @@
       const element = window.MozXULElement.parseXULToFragment(`
             <menuitem id="context_zen-add-essential"
                       data-l10n-id="tab-context-zen-add-essential"
-                      data-l10n-args='{"num": "0"}'
+                      data-l10n-args='{"num": "0", "max": "12"}'
                       hidden="true"
                       disabled="true"
                       command="cmd_contextZenAddToEssentials"/>
@@ -1081,6 +1089,7 @@
         contextTab.getAttribute('zen-essential') || !!contextTab.group;
       document.l10n.setArgs(document.getElementById('context_zen-add-essential'), {
         num: gBrowser._numZenEssentials,
+        max: this.maxEssentialTabs,
       });
       document
         .getElementById('cmd_contextZenAddToEssentials')
@@ -1404,7 +1413,7 @@
           (tab.getAttribute('usercontextid') || 0) !=
             gZenWorkspaces.getActiveWorkspaceFromCache().containerTabId &&
           gZenWorkspaces.containerSpecificEssentials
-        ) && gBrowser._numZenEssentials < this.MAX_ESSENTIALS_TABS
+        ) && gBrowser._numZenEssentials < this.maxEssentialTabs
       );
     }