diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index 1b658b233..981e2d991 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -100,7 +100,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     android:textColor="?attr/textColorInverse"
-                    android:text="@string/history"/>
+                    android:text="@string/entry_history"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <com.kunzisoft.keepass.view.EntryContentsView
diff --git a/app/src/main/res/layout/view_entry_contents.xml b/app/src/main/res/layout/view_entry_contents.xml
index 0bcb88635..fc169ce32 100644
--- a/app/src/main/res/layout/view_entry_contents.xml
+++ b/app/src/main/res/layout/view_entry_contents.xml
@@ -295,7 +295,7 @@
 				android:id="@+id/entry_history_label"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/history"
+				android:text="@string/entry_history"
 				style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
 
 			<androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a3cfa9fb1..25ad47724 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -216,7 +216,7 @@
 \nاستعد كلمة السر.</string>
     <string name="biometric_not_recognized">لم يتعرّف على البصمة</string>
     <string name="open_biometric_prompt_store_credential">استخدم البصمة لحفظ كلمة السر</string>
-    <string name="history">تأريخ</string>
+    <string name="database_history">تأريخ</string>
     <string name="clipboard_notifications_summary">مكن اشعارات الحافظة لنسخ الحقول</string>
     <string name="fingerprint_advanced_unlock_title">كيف أعد فحص البصمة للفتح السريع \?</string>
     <string name="fingerprint_setting_text">"احفظ البصمات في "</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9c3490669..71a74ab23 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -222,7 +222,7 @@
     <string name="biometric_scanning_error">Problém s otiskem prstu: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Použít pro uložení tohoto hesla otisk prstu</string>
     <string name="no_credentials_stored">Tato databáze zatím není chráněna heslem.</string>
-    <string name="history">Historie</string>
+    <string name="database_history">Historie</string>
     <string name="menu_appearance_settings">Vzhled</string>
     <string name="general">Obecné</string>
     <string name="autofill">Automatické vyplnění</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 3bbf73586..92a63dc69 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -221,7 +221,7 @@
     <string name="biometric_scanning_error">Problem med fingeraftryk: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Brug fingeraftryk til at gemme adgangskoden</string>
     <string name="no_credentials_stored">Databasen har endnu ikke en adgangskode.</string>
-    <string name="history">Historik</string>
+    <string name="database_history">Historik</string>
     <string name="menu_appearance_settings">Udseende</string>
     <string name="general">Generelt</string>
     <string name="autofill">Autoudfyld</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a40f60e45..6f2d3e24e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -207,7 +207,7 @@
     <string name="encrypted_value_stored">Verschlüsseltes Passwort wurde gespeichert</string>
     <string name="biometric_invalid_key">Fingerabdruckschlüssel nicht lesbar. Bitte das Passwort wiederherstellen.</string>
     <string name="biometric_scanning_error">Problem mit dem Fingerabdruck: %1$s</string>
-    <string name="history">Verlauf</string>
+    <string name="database_history">Verlauf</string>
     <string name="fingerprint_advanced_unlock_title">Wie richte ich den Fingerabdruckscanner für schnelles Entsperren ein?</string>
     <string name="fingerprint_setting_text">Eingelesenen Fingerabdruck für das Gerät speichern in</string>
     <string name="fingerprint_setting_link_text">„Einstellungen“ → „Sicherheit“ → „Fingerabdruck“</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fb4818fe8..f7efc953d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -207,7 +207,7 @@
     <string name="biometric_scanning_error">Problema de huella digital: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Usa la huella digital para almacenar esta contraseña</string>
     <string name="no_credentials_stored">Aún sin contraseña almacenada para esta base de datos</string>
-    <string name="history">Historial</string>
+    <string name="database_history">Historial</string>
     <string name="menu_appearance_settings">Apariencia</string>
     <string name="general">General</string>
     <string name="autofill">Autocompletar</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d4c171572..416952b2d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -187,7 +187,7 @@
     <string name="biometric_scanning_error">Problème d’empreinte digitale : %1$s</string>
     <string name="open_biometric_prompt_store_credential">Utiliser l’empreinte digitale pour stocker ce mot de passe</string>
     <string name="no_credentials_stored">Cette base de données n’a pas encore de mot de passe.</string>
-    <string name="history">Historique</string>
+    <string name="database_history">Historique</string>
     <string name="menu_appearance_settings">Apparence</string>
     <string name="general">Général</string>
     <string name="autofill">Remplissage automatique</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 277e2d203..8c65b3788 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -223,7 +223,7 @@
     <string name="warning_no_encryption_key">Biztos, hogy nem akar semmilyen titkosítási kulcsot használni\?</string>
     <string name="build_label">Összeállítás: %1$s</string>
     <string name="biometric_not_recognized">Az ujjlenyomat nem ismerhető fel</string>
-    <string name="history">Előzmények</string>
+    <string name="database_history">Előzmények</string>
     <string name="menu_appearance_settings">Megjelenés</string>
     <string name="general">Általános</string>
     <string name="autofill">Automatikus kitöltés</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c3b0b8c56..2fe99b112 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -215,7 +215,7 @@
     <string name="warning_empty_password">Vuoi veramente che non ci sia una password di sblocco\?</string>
     <string name="warning_no_encryption_key">Sei sicuro di non volere usare una chiave di cifratura?</string>
     <string name="biometric_not_recognized">Impronta non riconosciuta</string>
-    <string name="history">Cronologia</string>
+    <string name="database_history">Cronologia</string>
     <string name="menu_appearance_settings">Aspetto</string>
     <string name="general">Generale</string>
     <string name="autofill">Autocompletamento</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 7b9b545ef..057514b90 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -199,7 +199,7 @@
     <string name="biometric_scanning_error">Fingeravtrykksproblem: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Bruk fingeravtrykk til å lagre dette passordet</string>
     <string name="no_credentials_stored">Denne databasen har ikke et passord enda.</string>
-    <string name="history">Historikk</string>
+    <string name="database_history">Historikk</string>
     <string name="menu_appearance_settings">Utseende</string>
     <string name="general">Generelt</string>
     <string name="autofill">Autofyll</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4851a9e48..2d6c57636 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -222,7 +222,7 @@
     <string name="biometric_scanning_error">Vingerafdrukprobleem: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Vingerafdruk gebruiken om dit wachtwoord op te slaan</string>
     <string name="no_credentials_stored">Deze databank heeft nog geen wachtwoord.</string>
-    <string name="history">Geschiedenis</string>
+    <string name="database_history">Geschiedenis</string>
     <string name="menu_appearance_settings">Uiterlijk</string>
     <string name="general">Algemeen</string>
     <string name="autofill">Auto-aanvullen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d5f65001b..8e5d403c0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -220,7 +220,7 @@
     <string name="biometric_scanning_error">Problem z odciskiem palca: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Użyj odcisku palca, aby zapisać to hasło</string>
     <string name="no_credentials_stored">Baza danych nie ma jeszcze hasła.</string>
-    <string name="history">Historia</string>
+    <string name="database_history">Historia</string>
     <string name="menu_appearance_settings">Wygląd</string>
     <string name="general">Ogólne</string>
     <string name="autofill">Wypełnij automatycznie</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 49b8ab630..8d89b65f4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -216,7 +216,7 @@
     <string name="biometric_scanning_error">Problema de Impressão digital: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Use Impressão digital para armazenar esta senha</string>
     <string name="no_credentials_stored">Ainda não há nenhuma senha armazenada nesse banco de dados.</string>
-    <string name="history">Histórico</string>
+    <string name="database_history">Histórico</string>
     <string name="menu_appearance_settings">Aparência</string>
     <string name="general">Geral</string>
     <string name="autofill">Preenchimento automático</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 7e11de7f2..fef5eba5a 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -212,7 +212,7 @@
     <string name="biometric_scanning_error">Problema da Impressão digital: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Use a impressão digital para armazenar esta palavra-chave</string>
     <string name="no_credentials_stored">Ainda não há nenhuma palavra-chave armazenada nesta base de dados.</string>
-    <string name="history">Histórico</string>
+    <string name="database_history">Histórico</string>
     <string name="menu_appearance_settings">Aparência</string>
     <string name="general">Geral</string>
     <string name="autofill">Preenchimento automático</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0d1503ee5..ba9c390b9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -220,7 +220,7 @@
     <string name="warning_empty_password">Вы действительно хотите использовать пустой пароль?</string>
     <string name="warning_no_encryption_key">Вы действительно не хотите использовать ключ шифрования?</string>
     <string name="biometric_not_recognized">Отпечаток пальца не распознан</string>
-    <string name="history">История</string>
+    <string name="database_history">История</string>
     <string name="menu_appearance_settings">Внешний вид</string>
     <string name="general">Общие</string>
     <string name="autofill">Автозаполнение</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b63d20695..cb87df18d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -202,7 +202,7 @@
     <string name="biometric_scanning_error">Parmak izi sorunu: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Bu şifreyi saklamak için parmak izini kullanın</string>
     <string name="no_credentials_stored">Bu veritabanının henüz bir parolası yok.</string>
-    <string name="history">Geçmiş</string>
+    <string name="database_history">Geçmiş</string>
     <string name="menu_appearance_settings">Görünüm</string>
     <string name="general">Genel</string>
     <string name="autofill">Otomatik Doldurma</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9adab972d..dd0675f2d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -209,7 +209,7 @@
     <string name="warning">警告</string>
     <string name="version_label">版本 %1$s</string>
     <string name="open_biometric_prompt_store_credential">使用指纹保存此密码</string>
-    <string name="history">历史</string>
+    <string name="database_history">历史</string>
     <string name="menu_appearance_settings">外观</string>
     <string name="general">一般设置</string>
     <string name="autofill">自动填充</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c33bec66..3ba857951 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,6 +81,7 @@
     <string name="entry_created">Created</string>
     <string name="entry_expires">Expires</string>
     <string name="entry_UUID">UUID</string>
+    <string name="entry_history">History</string>
     <string name="entry_keyfile">Keyfile</string>
     <string name="entry_modified">Modified</string>
     <string name="entry_not_found">Could not find entry data.</string>
@@ -238,7 +239,7 @@
     <!--This problem could be with scanning, or something else.-->
     <string name="biometric_scanning_error">Biometric error: %1$s</string>
     <string name="no_credentials_stored">This database does not have stored credential yet.</string>
-    <string name="history">History</string>
+    <string name="database_history">History</string>
     <string name="menu_appearance_settings">Appearance</string>
     <string name="biometric">Biometric</string>
     <string name="general">General</string>
diff --git a/app/src/main/res/xml/preferences_application.xml b/app/src/main/res/xml/preferences_application.xml
index cbfebdb80..1f03dbb70 100644
--- a/app/src/main/res/xml/preferences_application.xml
+++ b/app/src/main/res/xml/preferences_application.xml
@@ -108,7 +108,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/history">
+        android:title="@string/database_history">
 
         <SwitchPreference
             android:key="@string/recentfile_key"