From 742a1e688223ccc17e09b914dbf3a242c8ecc442 Mon Sep 17 00:00:00 2001
From: Davide Taffarello <78680412+TheSilvered@users.noreply.github.com>
Date: Mon, 30 Mar 2026 14:15:25 +0200
Subject: [PATCH] gh-12730: conflict keybord shortcut name always shows
 "Escape" (gh-12993)

Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 src/browser/components/preferences/zen-settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 4541bf90a..16ddcbc63 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1067,7 +1067,7 @@ var gZenCKSSettings = {
             zenMissingKeyboardShortcutL10n[conflictShortcut.getID()] ??
             conflictShortcut.getL10NID();
 
-          const [group] = await document.l10n.formatValues([
+          const [group, conflictName] = await document.l10n.formatValues([
             { id: `${ZEN_CKS_GROUP_PREFIX}-${conflictShortcut.getGroup()}` },
             { id: shortcutL10nKey },
           ]);
@@ -1082,7 +1082,7 @@ var gZenCKSSettings = {
 
           document.l10n.setAttributes(input.nextElementSibling, "zen-key-conflict", {
             group: group ?? "",
-            shortcut: shortcut ?? "",
+            shortcut: conflictName ?? shortcut ?? "",
           });
         }
       } else {