From fb5fd17af391b3d85ae9d637d51d5430e4b146a7 Mon Sep 17 00:00:00 2001
From: Jean Perbet <jeanperbet@icloud.com>
Date: Fri, 5 Apr 2024 12:40:15 +0200
Subject: [PATCH 1/4] refactor: changed Key Bindings to Keyboard shortcuts in
 UI, updated i10n en_properties

---
 .../jabref/gui/preferences/keybindings/KeyBindingsTab.fxml  | 2 +-
 .../jabref/gui/preferences/keybindings/KeyBindingsTab.java  | 2 +-
 .../preferences/keybindings/KeyBindingsTabViewModel.java    | 6 +++---
 src/main/resources/l10n/JabRef_en.properties                | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
index 6f0f03bec7e..e20461d98e4 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
@@ -12,7 +12,7 @@
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.keybindings.KeyBindingsTab">
 
-    <Label styleClass="titleHeader" text="%Key bindings"/>
+    <Label styleClass="titleHeader" text="%Keyboard shortcuts"/>
 
     <TreeTableView fx:id="keyBindingsTable" showRoot="false" styleClass="keybinding-table">
         <columns>
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
index 973159b9378..b39ff84301a 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
@@ -41,7 +41,7 @@ public KeyBindingsTab() {
 
     @Override
     public String getTabName() {
-        return Localization.lang("Key bindings");
+        return Localization.lang("Keyboard shortcuts");
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
index cf7332d5432..6e46db78dae 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
@@ -88,13 +88,13 @@ public void storeSettings() {
         preferences.storeKeyBindingRepository(keyBindingRepository);
 
         if (!keyBindingRepository.equals(initialKeyBindingRepository)) {
-            restartWarning.add(Localization.lang("Key bindings changed"));
+            restartWarning.add(Localization.lang("Keyboard shortcuts changed"));
         }
     }
 
     public void resetToDefault() {
-        String title = Localization.lang("Resetting all key bindings");
-        String content = Localization.lang("All key bindings will be reset to their defaults.");
+        String title = Localization.lang("Resetting all keyboard shortcuts");
+        String content = Localization.lang("All keyboard shortcuts will be reset to their defaults.");
         ButtonType resetButtonType = new ButtonType("Reset", ButtonBar.ButtonData.OK_DONE);
         dialogService.showCustomButtonDialogAndWait(Alert.AlertType.INFORMATION, title, content, resetButtonType,
                 ButtonType.CANCEL).ifPresent(response -> {
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 666996eb73a..37d4b230a49 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -513,6 +513,8 @@ Key\ bindings\ changed=Key bindings changed
 
 Key\ pattern=Key pattern
 
+Keyboard\ shortcuts=Keyboard shortcuts
+
 keys\ in\ library=keys in library
 
 Keyword=Keyword

From 4a2cad339d19bf0cbb8bd311dc75f97056ba73f5 Mon Sep 17 00:00:00 2001
From: Jean Perbet <jeanperbet@icloud.com>
Date: Fri, 5 Apr 2024 17:06:28 +0200
Subject: [PATCH 2/4] fix: removed properties in i10n english file to fix unit
 tests

---
 .../java/org/jabref/gui/actions/StandardActions.java |  3 +--
 src/main/resources/l10n/JabRef_en.properties         | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 949dac28b29..b0d0b9d81f8 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -119,8 +119,7 @@ public enum StandardActions implements Action {
     CITATION_KEY_PATTERN(Localization.lang("Citation key patterns")),
     SHOW_PREFS(Localization.lang("Preferences"), IconTheme.JabRefIcons.PREFERENCES),
     MANAGE_JOURNALS(Localization.lang("Manage journal abbreviations")),
-    CUSTOMIZE_KEYBINDING(Localization.lang("Customize key bindings"), IconTheme.JabRefIcons.KEY_BINDINGS),
-
+    CUSTOMIZE_KEYBINDING(Localization.lang("Customize keyboard shortcuts"), IconTheme.JabRefIcons.KEY_BINDINGS),
     EDIT_ENTRY(Localization.lang("Open entry editor"), IconTheme.JabRefIcons.EDIT_ENTRY, KeyBinding.EDIT_ENTRY),
     SHOW_PDF_VIEWER(Localization.lang("Open document viewer"), IconTheme.JabRefIcons.PDF_FILE),
     NEXT_PREVIEW_STYLE(Localization.lang("Next preview style"), KeyBinding.NEXT_PREVIEW_LAYOUT),
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 37d4b230a49..ce06acfe80b 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -219,7 +219,7 @@ Custom\ entry\ types\ found\ in\ file=Custom entry types found in file
 
 Customize\ entry\ types=Customize entry types
 
-Customize\ key\ bindings=Customize key bindings
+Customize\ keyboard\ shortcuts=Customize keyboard shortcuts
 
 Cut=Cut
 
@@ -507,14 +507,12 @@ Keep\ both=Keep both
 
 Keep\ subgroups=Keep subgroups
 
-Key\ bindings=Key bindings
-
-Key\ bindings\ changed=Key bindings changed
-
 Key\ pattern=Key pattern
 
 Keyboard\ shortcuts=Keyboard shortcuts
 
+Keyboard\ shortcuts\ changed=Keyboard shortcuts changed
+
 keys\ in\ library=keys in library
 
 Keyword=Keyword
@@ -1249,13 +1247,13 @@ You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=You have to choose exac
 
 Add\ timestamp\ to\ modified\ entries\ (field\ "modificationdate")=Add timestamp to modified entries (field "modificationdate")
 Add\ timestamp\ to\ new\ entries\ (field\ "creationdate")=Add timestamp to new entries (field "creationdate")
-All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=All key bindings will be reset to their defaults.
+All\ keyboard\ shortcuts\ will\ be\ reset\ to\ their\ defaults.=All keyboard shortcuts will be reset to their defaults.
 
 Automatically\ set\ file\ links=Automatically set file links
 Finished\ automatically\ setting\ external\ links.=Finished automatically setting external links.
 Changed\ %0\ entries.=Changed %0 entries.
 
-Resetting\ all\ key\ bindings=Resetting all key bindings
+Resetting\ all\ keyboard\ shortcuts=Resetting all keyboard shortcuts
 
 Open\ folder=Open folder
 Export\ sort\ order=Export sort order

From d558d1d02e281799473cb1eedb9e9c397513ecce Mon Sep 17 00:00:00 2001
From: Jean Perbet <jeanperbet@icloud.com>
Date: Fri, 5 Apr 2024 18:34:43 +0200
Subject: [PATCH 3/4] doc: updated CHANGELOG.md to register changes

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99d2ef06715..d6986e1272f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Changed
 
+- We replaced "Key bindings" by "Keyboard shortcuts" in the Preferences tab related to key bindings.
+
 ### Fixed
 
 - We fixed an issue where entry type with duplicate fields prevented opening existing libraries with custom entry types [#11127](https://github.com/JabRef/jabref/issues/11127)

From c61ba2cb870376e45ed5aaa1d60941588ce93f0a Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Fri, 5 Apr 2024 22:21:09 +0200
Subject: [PATCH 4/4] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6986e1272f..52d57281524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Changed
 
-- We replaced "Key bindings" by "Keyboard shortcuts" in the Preferences tab related to key bindings.
+- We replaced the word "Key bindings" with "Keyboard shortcuts" in the Preferences tab. [#11153](https://github.com/JabRef/jabref/pull/11153)
 
 ### Fixed