From f9d99fe8cac5a0306137b9679f3b292ceff5c156 Mon Sep 17 00:00:00 2001
From: Bernhard Kirchen <schlimmchen@posteo.net>
Date: Mon, 4 Apr 2022 16:25:06 +0200
Subject: [PATCH] revise strings labeling history limit settings

---
 share/translations/keepassxc_en.ts            | 37 +++++++++++++++----
 .../DatabaseSettingsWidgetGeneral.ui          | 20 ++++++++--
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index fd7a60e0..b0c1d25f 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -1967,18 +1967,10 @@ If you keep this number, your database will not be protected from brute force at
         <source>Maximum number of history items per entry</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Max. history items:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Maximum size of history per entry</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Max. history size:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source> MiB</source>
         <translation type="unfinished"></translation>
@@ -2008,6 +2000,35 @@ This action is not reversible.</source>
         <source> (old)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>When saving this setting or editing an entry
+the oldest history items of an entry will be
+removed such that only the specified amount
+of entries remain at most.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit the amount of history items per entry to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When saving this setting or editing an entry
+the oldest history items of an entry will be
+removed such that the remaining history items
+add up to the specified amount at most.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit the total size of history items per entry to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move entries to a recycle bin group
+instead of deleting them from the database.
+Entries deleted from the recycle bin are
+removed from the database.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetKeeShare</name>
diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui b/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui
index 34185ad2..952b444b 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui
@@ -100,20 +100,26 @@
         <item row="0" column="0">
          <widget class="QCheckBox" name="historyMaxItemsCheckBox">
           <property name="toolTip">
-           <string>Maximum number of history items per entry</string>
+           <string>When saving this setting or editing an entry
+the oldest history items of an entry will be
+removed such that only the specified amount
+of entries remain at most.</string>
           </property>
           <property name="text">
-           <string>Max. history items:</string>
+           <string>Limit the amount of history items per entry to:</string>
           </property>
          </widget>
         </item>
         <item row="1" column="0">
          <widget class="QCheckBox" name="historyMaxSizeCheckBox">
           <property name="toolTip">
-           <string>Maximum size of history per entry</string>
+           <string>When saving this setting or editing an entry
+the oldest history items of an entry will be
+removed such that the remaining history items
+add up to the specified amount at most.</string>
           </property>
           <property name="text">
-           <string>Max. history size:</string>
+           <string>Limit the total size of history items per entry to:</string>
           </property>
          </widget>
         </item>
@@ -151,6 +157,12 @@
         </item>
         <item row="2" column="0">
          <widget class="QCheckBox" name="recycleBinEnabledCheckBox">
+          <property name="toolTip">
+           <string>Move entries to a recycle bin group
+instead of deleting them from the database.
+Entries deleted from the recycle bin are
+removed from the database.</string>
+          </property>
           <property name="text">
            <string>Use recycle bin</string>
           </property>