diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7868c10b..97ecd5685b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,41 @@
 # Changelog
 
+## 2.5.2 (2020-01-04)
+
+### Added
+
+- Browser: Show UI warning when entering invalid URLs [#3912]
+- Browser: Option to use an entry only for HTTP auth [#3927]
+
+### Changed
+
+- Disable the user interface when merging or saving the database [#3991]
+- Ability to hide protected attribute after reveal [#3877]
+- Remove mention of "snaps" in Windows and macOS [#3879]
+- CLI: Merge parameter for source database key file (--key-file-from) [#3961]
+- Improve GUI tests reliability on Hi-DPI displays [#4075]
+- Disable deprecation warnings to allow building with Qt 5.14+ [#4075]
+- OPVault: Use 'otp' attribute for TOTP field imports [#4075]
+
+### Fixed
+
+- Fix crashes when saving a database to cloud storage [#3991]
+- Fix crash when pressing enter twice while opening database [#3885]
+- Fix handling of HTML when displayed in the entry preview panel [#3910]
+- Fix start minimized to tray on Linux [#3899]
+- Fix Auto Open with key file only databases [#4075]
+- Fix escape key closing the standalone password generator [#3892]
+- macOS: Fix monospace font usage in password field and notes [#4075]
+- macOS: Fix building on macOS 10.9 to 10.11 [#3946]
+- Fix TOTP setup dialog not closing on database lock [#4075]
+- Browser: Fix condition where additional URLs are ignored [#4033]
+- Browser: Fix subdomain matching to return only relevant site entries [#3854]
+- Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074]
+- Secret Service: Fix searching of entries [#4008, #4036]
+- Secret Service: Fix behavior when exposed group is recycled [#3914]
+- CLI: Release the database instance before exiting interactive mode [#3889]
+- Fix (most) memory leaks in tests [#3922]
+
 ## 2.5.1 (2019-11-11)
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32f7611ab9..c2f9b5bfe8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ endif (CCACHE_FOUND)
 
 # Support Visual Studio Code
 include(CMakeToolsHelpers OPTIONAL)
+include(FeatureSummary)
 
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
@@ -94,7 +95,7 @@ endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "5")
-set(KEEPASSXC_VERSION_PATCH "1")
+set(KEEPASSXC_VERSION_PATCH "2")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
 
@@ -299,6 +300,9 @@ endif()
 
 if(WITH_DEV_BUILD)
     add_definitions(-DQT_DEPRECATED_WARNINGS -DGCRYPT_NO_DEPRECATED)
+else()
+    add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+    add_gcc_compiler_cxxflags("-Wno-deprecated-declarations")
 endif()
 
 if(MINGW)
@@ -465,8 +469,6 @@ endif()
 
 include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
-include(FeatureSummary)
-
 add_subdirectory(src)
 add_subdirectory(share)
 if(WITH_TESTS)
diff --git a/COPYING b/COPYING
index 9bfd33539a..fe7d02f3eb 100644
--- a/COPYING
+++ b/COPYING
@@ -248,3 +248,8 @@ Comment: from Freedesktop.org website
 
 Files: share/icons/application/32x32/actions/statistics.png
 Copyright: Icon made by Freepik from https://www.flaticon.com/free-icon/bars-chart_265733
+
+Files: share/icons/application/scalable/actions/object-locked.svg
+       share/icons/application/scalable/actions/object-unlocked.svg
+License: LGPL-3
+Comment: from Breeze icon theme (https://github.com/KDE/breeze-icons)
diff --git a/INSTALL.md b/INSTALL.md
index e82fb53b17..e11344eedb 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -150,9 +150,15 @@ You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..).
 Testing
 =======
 
-You can perform test on the executable
+You can perform tests on the built executables with:
 ```
-make test
+make test ARGS+="--output-on-failure"
+```
+
+If you are not currently running on an X Server or Wayland, run the tests as follows:
+```
+make test ARGS+="-E test\(cli\|gui\) --output-on-failure"
+xvfb-run -e errors -a --server-args="-screen 0 1024x768x24" make test ARGS+="-R test\(cli\|gui\) --output-on-failure"
 ```
 
 Common parameters:
diff --git a/share/docs/man/keepassxc-cli.1 b/share/docs/man/keepassxc-cli.1
index bcc97efaea..2be6b198ac 100644
--- a/share/docs/man/keepassxc-cli.1
+++ b/share/docs/man/keepassxc-cli.1
@@ -117,7 +117,7 @@ Displays the program version.
 .IP "-d, --dry-run <path>"
 Prints the changes detected by the merge operation without making any changes to the database.
 
-.IP "-f, --key-file-from <path>"
+.IP "--key-file-from <path>"
 Sets the path of the key file for the second database.
 
 .IP "--no-password-from"
diff --git a/share/icons/application/scalable/actions/object-locked.svg b/share/icons/application/scalable/actions/object-locked.svg
new file mode 100644
index 0000000000..090e038c0b
--- /dev/null
+++ b/share/icons/application/scalable/actions/object-locked.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 11,3 C 8.784,3 7,4.784 7,7 l 0,4 -2,0 c 0,2.666667 0,5.333333 0,8 4,0 8,0 12,0 l 0,-8 c -0.666667,0 -1.333333,0 -2,0 L 15,7 C 15,4.784 13.216,3 11,3 m 0,1 c 1.662,0 3,1.561 3,3.5 L 14,11 8,11 8,7.5 C 8,5.561 9.338,4 11,4"
+     class="ColorScheme-Text"
+       transform="translate(1,1)"
+     />
+</svg>
diff --git a/share/icons/application/scalable/actions/object-unlocked.svg b/share/icons/application/scalable/actions/object-unlocked.svg
new file mode 100644
index 0000000000..f6c53e5816
--- /dev/null
+++ b/share/icons/application/scalable/actions/object-unlocked.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+   d="m11 3c-2.216 0-4 1.784-4 4v1h1v-.5c0-1.939 1.338-3.5 3-3.5 1.662 0 3 1.561 3 3.5v3.5h-5-1-1-1-1v1 7h1 10 1v-8h-1-1v-4c0-2.216-1.784-4-4-4m-5 9h10v6h-10v-6"
+    class="ColorScheme-Text"
+     transform="translate(1,1)"
+    />
+</svg>
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index 9d3f76d874..e1fe399364 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,37 @@
     </screenshots>
 
     <releases>
+        <release version="2.5.2" date="2020-01-04">
+            <description>
+                <ul>
+                    <li>Browser: Show UI warning when entering invalid URLs [#3912]</li>
+                    <li>Browser: Option to use an entry only for HTTP auth [#3927]</li>
+                    <li>Disable the user interface when merging or saving the database [#3991]</li>
+                    <li>Ability to hide protected attribute after reveal [#3877]</li>
+                    <li>Remove mention of "snaps" in Windows and macOS [#3879]</li>
+                    <li>CLI: Merge parameter for source database key file (--key-file-from) [#3961]</li>
+                    <li>Improve GUI tests reliability on Hi-DPI displays [#4075]</li>
+                    <li>Disable deprecation warnings to allow building with Qt 5.14+ [#4075]</li>
+                    <li>OPVault: Use 'otp' attribute for TOTP field imports [#4075]</li>
+                    <li>Fix crashes when saving a database to cloud storage [#3991]</li>
+                    <li>Fix crash when pressing enter twice while opening database [#3885]</li>
+                    <li>Fix handling of HTML when displayed in the entry preview panel [#3910]</li>
+                    <li>Fix start minimized to tray on Linux [#3899]</li>
+                    <li>Fix Auto Open with key file only databases [#4075]</li>
+                    <li>Fix escape key closing the standalone password generator [#3892]</li>
+                    <li>macOS: Fix monospace font usage in password field and notes [#4075]</li>
+                    <li>macOS: Fix building on macOS 10.9 to 10.11 [#3946]</li>
+                    <li>Fix TOTP setup dialog not closing on database lock [#4075]</li>
+                    <li>Browser: Fix condition where additional URLs are ignored [#4033]</li>
+                    <li>Browser: Fix subdomain matching to return only relevant site entries [#3854]</li>
+                    <li>Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074]</li>
+                    <li>Secret Service: Fix searching of entries [#4008, #4036]</li>
+                    <li>Secret Service: Fix behavior when exposed group is recycled [#3914]</li>
+                    <li>CLI: Release the database instance before exiting interactive mode [#3889]</li>
+                    <li>Fix (most) memory leaks in tests [#3922]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.5.1" date="2019-11-11">
             <description>
                 <ul>
diff --git a/share/translations/keepassx_ar.ts b/share/translations/keepassx_ar.ts
index 3fe988b88e..7c1b015feb 100644
--- a/share/translations/keepassx_ar.ts
+++ b/share/translations/keepassx_ar.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;إستكشاف المساهمين عبر GitHub&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;إستكشاف المساهمات عبر GitHub&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Debug Info</source>
@@ -43,7 +43,7 @@
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
-        <translation>شكر خاص من فريق KeePassXC يذهب إلى debfx لإنشاء KeePassX الأصلي.</translation>
+        <translation>شكر خاص من فريق KeePassXC إلى debfx لإنشاء KeePassX الأصلي.</translation>
     </message>
 </context>
 <context>
@@ -77,23 +77,23 @@
     </message>
     <message>
         <source>Icon only</source>
-        <translation type="unfinished"/>
+        <translation>الأيقونة فقط</translation>
     </message>
     <message>
         <source>Text only</source>
-        <translation type="unfinished"/>
+        <translation>الوصف بالكلمات فقط </translation>
     </message>
     <message>
         <source>Text beside icon</source>
-        <translation type="unfinished"/>
+        <translation>وصف حرفي بجانب الأيقونة</translation>
     </message>
     <message>
         <source>Text under icon</source>
-        <translation type="unfinished"/>
+        <translation>الوصف أسفل الأيقونة</translation>
     </message>
     <message>
         <source>Follow style</source>
-        <translation type="unfinished"/>
+        <translation>تابع النمط</translation>
     </message>
     <message>
         <source>Reset Settings?</source>
@@ -101,7 +101,7 @@
     </message>
     <message>
         <source>Are you sure you want to reset all general and security settings to default?</source>
-        <translation type="unfinished"/>
+        <translation>هل أنت متأكد من رغبتك في إعادة جميع الإعدادات العامة وإعدادات الأمن الى وضعها النمطي الأولي ؟</translation>
     </message>
 </context>
 <context>
@@ -116,7 +116,7 @@
     </message>
     <message>
         <source>Start only a single instance of KeePassXC</source>
-        <translation>شغل تطبيق واحد فقط من KeePassXC</translation>
+        <translation>شغل نسخة واحدة فقط من تطبيق KeePassXC</translation>
     </message>
     <message>
         <source>Minimize window at application startup</source>
@@ -132,7 +132,7 @@
     </message>
     <message>
         <source>Backup database file before saving</source>
-        <translation>إحتفظ بنسخة من ملف قاعدة البيانات قبل الحفظ</translation>
+        <translation>عمل نسخة إحتياطية من ملف قاعدة البيانات قبل الحفظ</translation>
     </message>
     <message>
         <source>Automatically save after every change</source>
@@ -152,15 +152,15 @@
     </message>
     <message>
         <source>Entry Management</source>
-        <translation>إدارة الإدخالات</translation>
+        <translation>إدارة ادخال البيانات</translation>
     </message>
     <message>
         <source>Use group icon on entry creation</source>
-        <translation>استخدم رمز المجموعة عند إنشاء الإدخال</translation>
+        <translation>استخدم شعار المجموعة عند إنشاء المدخلات</translation>
     </message>
     <message>
         <source>Hide the entry preview panel</source>
-        <translation type="unfinished"/>
+        <translation>إخفاء إستعراض لوحة المدخلات  </translation>
     </message>
     <message>
         <source>General</source>
@@ -168,15 +168,15 @@
     </message>
     <message>
         <source>Hide toolbar (icons)</source>
-        <translation type="unfinished"/>
+        <translation>إخفاء شريط العُدد (الأيقونات)</translation>
     </message>
     <message>
         <source>Minimize instead of app exit</source>
-        <translation type="unfinished"/>
+        <translation> تصغيرالتطبيق بدل الخروج منه </translation>
     </message>
     <message>
         <source>Show a system tray icon</source>
-        <translation>اظهر أيقونة البرنامج في صينية النظام</translation>
+        <translation>اظهار أيقونة البرنامج في شريط واجهة النظام</translation>
     </message>
     <message>
         <source>Dark system tray icon</source>
@@ -188,7 +188,7 @@
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>الطباعة التلقائية</translation>
+        <translation> نمط تلقائي</translation>
     </message>
     <message>
         <source>Use entry title to match windows for global Auto-Type</source>
@@ -200,7 +200,7 @@
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
-        <translation>اسأل دائما قبل تنفيذ الطباعة التلقائية</translation>
+        <translation>السؤأل دائما قبل التغيير للنمط التلقائي</translation>
     </message>
     <message>
         <source>Global Auto-Type shortcut</source>
@@ -213,7 +213,7 @@
     <message>
         <source> ms</source>
         <comment>Milliseconds</comment>
-        <translation>مل.ثانية</translation>
+        <translation>جزء الثانية</translation>
     </message>
     <message>
         <source>Auto-Type start delay</source>
@@ -221,15 +221,15 @@
     </message>
     <message>
         <source>Movable toolbar</source>
-        <translation type="unfinished"/>
+        <translation> شريط عُدد قابل للتحريك</translation>
     </message>
     <message>
         <source>Remember previously used databases</source>
-        <translation type="unfinished"/>
+        <translation> تذكُر قاعدة البيانات المستخدمة أخيراً</translation>
     </message>
     <message>
         <source>Load previously open databases on startup</source>
-        <translation type="unfinished"/>
+        <translation> عند بدء التشغيل إعادة فتح قواعد البيانات التي مفتوحة سابقاً</translation>
     </message>
     <message>
         <source>Remember database key files and security dongles</source>
@@ -237,7 +237,7 @@
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
-        <translation type="unfinished"/>
+        <translation> فحص وجود تحديثات للبرامج عند بدء تشغيل التطبيق مرة واحدة  في الأسبوع </translation>
     </message>
     <message>
         <source>Include beta releases when checking for updates</source>
@@ -249,39 +249,39 @@
     </message>
     <message>
         <source>Language:</source>
-        <translation type="unfinished"/>
+        <translation> اللغة</translation>
     </message>
     <message>
         <source>(restart program to activate)</source>
-        <translation type="unfinished"/>
+        <translation> ( للتفعيل يرجى إعادة التشغيل ) </translation>
     </message>
     <message>
         <source>Minimize window after unlocking database</source>
-        <translation type="unfinished"/>
+        <translation> تصغيرنافذة التطبيق بعد فتح قاعدة البيانات</translation>
     </message>
     <message>
         <source>Minimize when opening a URL</source>
-        <translation type="unfinished"/>
+        <translation> تصغير البرنامج عند فتح رابط  URL  من النت </translation>
     </message>
     <message>
         <source>Hide window when copying to clipboard</source>
-        <translation type="unfinished"/>
+        <translation> إخفاء نافذة البرنامج عند النسخ الى الحافظة </translation>
     </message>
     <message>
         <source>Minimize</source>
-        <translation type="unfinished"/>
+        <translation> تصغير</translation>
     </message>
     <message>
         <source>Drop to background</source>
-        <translation type="unfinished"/>
+        <translation> الإرجاع الى الخلفية </translation>
     </message>
     <message>
         <source>Favicon download timeout:</source>
-        <translation type="unfinished"/>
+        <translation> فوت الوقت لتنزيل أيقونة الشعارالمفضل</translation>
     </message>
     <message>
         <source>Website icon download timeout in seconds</source>
-        <translation type="unfinished"/>
+        <translation> الزمن بالثانية لفوت الإتصال لتنزيل أيقونة الموقع</translation>
     </message>
     <message>
         <source> sec</source>
@@ -290,38 +290,39 @@
     </message>
     <message>
         <source>Toolbar button style</source>
-        <translation type="unfinished"/>
+        <translation> نمط مفاتيح شريط العُدد </translation>
     </message>
     <message>
         <source>Use monospaced font for Notes</source>
-        <translation type="unfinished"/>
+        <translation> إستخدام بنط ذا مسافات أحادية في الملاحظات</translation>
     </message>
     <message>
         <source>Language selection</source>
-        <translation type="unfinished"/>
+        <translation> إختيار اللغة</translation>
     </message>
     <message>
         <source>Reset Settings to Default</source>
-        <translation type="unfinished"/>
+        <translation> إعادة الإعدادات الى وضعها الأولي</translation>
     </message>
     <message>
         <source>Global auto-type shortcut</source>
-        <translation type="unfinished"/>
+        <translation> المختصر الى النمط-التلقائي العمومي</translation>
     </message>
     <message>
         <source>Auto-type character typing delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation> تأخيرالطباعة لأحرف النمط-التلقائي
+ بأجزاء الثانية </translation>
     </message>
     <message>
         <source>Auto-type start delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation> تأخير بدء النمط-التلقائي بأجزاء الثانية</translation>
     </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetSecurity</name>
     <message>
         <source>Timeouts</source>
-        <translation>مهلة نفاد الوقت</translation>
+        <translation> نفاذ الوقت</translation>
     </message>
     <message>
         <source>Clear clipboard after</source>
@@ -334,11 +335,11 @@
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation>أغلق قواعد البيانات بعد حالة عدم النشاط ل</translation>
+        <translation>أغلق قواعد البيانات بعد حالة عدم النشاط لـ</translation>
     </message>
     <message>
         <source> min</source>
-        <translation type="unfinished"/>
+        <translation> دقيقة</translation>
     </message>
     <message>
         <source>Forget TouchID after inactivity of</source>
@@ -354,7 +355,7 @@
     </message>
     <message>
         <source>Forget TouchID when session is locked or lid is closed</source>
-        <translation type="unfinished"/>
+        <translation> إنسى هوية البصمة عند قفل حصة التفاعل أو عند إغلاق الشاشة </translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -362,7 +363,7 @@
     </message>
     <message>
         <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>أعد قفل قاعدة البيانات التي تم تأمينها سابقًا بعد تنفيذ الطباعة التلقائية</translation>
+        <translation>أعد قفل قاعدة البيانات التي تم تأمينها سابقًا بعدالتغيير للنمط التلقائي</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
@@ -370,15 +371,15 @@
     </message>
     <message>
         <source>Don&apos;t hide passwords when editing them</source>
-        <translation type="unfinished"/>
+        <translation> لا تخفي كلمات السر عند تعديلها </translation>
     </message>
     <message>
         <source>Don&apos;t use placeholder for empty password fields</source>
-        <translation type="unfinished"/>
+        <translation> لا تستعمل محددات أقواس أو مزدوجات لحقول كلمات السر الفارغة </translation>
     </message>
     <message>
         <source>Hide passwords in the entry preview panel</source>
-        <translation type="unfinished"/>
+        <translation> اخفي كلمات السر في لوحة إستعراض المدخلات</translation>
     </message>
     <message>
         <source>Hide entry notes by default</source>
@@ -390,28 +391,28 @@
     </message>
     <message>
         <source>Use DuckDuckGo service to download website icons</source>
-        <translation type="unfinished"/>
+        <translation> استعمل خدمة  DuckDuckGo  لتنزيل أيقونات مواقع الإنترنت</translation>
     </message>
     <message>
         <source>Clipboard clear seconds</source>
-        <translation type="unfinished"/>
+        <translation> مسح لوحة الحفظ بالثواني</translation>
     </message>
     <message>
         <source>Touch ID inactivity reset</source>
-        <translation type="unfinished"/>
+        <translation> المهلة الزمنية لعدم التفاعل لنسيان هوية البصمة</translation>
     </message>
     <message>
         <source>Database lock timeout seconds</source>
-        <translation type="unfinished"/>
+        <translation> المهلة الزنسة لقفل قواعد البيانات </translation>
     </message>
     <message>
         <source> min</source>
         <comment>Minutes</comment>
-        <translation type="unfinished"/>
+        <translation> دقيقة</translation>
     </message>
     <message>
         <source>Clear search query after</source>
-        <translation type="unfinished"/>
+        <translation> مسح محددات البحث بعد مضي </translation>
     </message>
 </context>
 <context>
@@ -446,11 +447,12 @@
     </message>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>إذن السماح مطلوب</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation> KeePassXC يطلب إذن السماح بالدخول لإنجاز التغييرات المبدئية وفق النمط-التلقائي . إذا كنت قد أعطيت الإذن بالسماح 
+ فقد يستوجب منك ذلك إعادة تشغيل  KeePassXC   </translation>
     </message>
 </context>
 <context>
@@ -491,18 +493,18 @@
     <name>AutoTypeMatchView</name>
     <message>
         <source>Copy &amp;username</source>
-        <translation>نسخ &amp;اسم المستخدم</translation>
+        <translation> نسخ و اسم المستخدم</translation>
     </message>
     <message>
         <source>Copy &amp;password</source>
-        <translation type="unfinished"/>
+        <translation> نسخ و كلمة السر</translation>
     </message>
 </context>
 <context>
     <name>AutoTypePlatformMac</name>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>إذن السماح مطلوب</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
@@ -513,11 +515,11 @@
     <name>AutoTypeSelectDialog</name>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>الطباعة التلقائية - KeePassXC</translation>
+        <translation>النمط التلقائي - KeePassXC</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>حدد مدخل للطباعة التلقائية:</translation>
+        <translation>إختيار مدخلات الى  النمط التلقائي:</translation>
     </message>
     <message>
         <source>Search...</source>
@@ -550,31 +552,32 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Allow access</source>
-        <translation type="unfinished"/>
+        <translation> أسمح بالدخول</translation>
     </message>
     <message>
         <source>Deny access</source>
-        <translation type="unfinished"/>
+        <translation> أمنع الدخول</translation>
     </message>
 </context>
 <context>
     <name>BrowserEntrySaveDialog</name>
     <message>
         <source>KeePassXC-Browser Save Entry</source>
-        <translation type="unfinished"/>
+        <translation> متصفح KeePassXC  إحفظ المدخلات</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>  تمام</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>ألغ</translation>
+        <translation>ألغاء</translation>
     </message>
     <message>
         <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
-        <translation type="unfinished"/>
+        <translation> لديك العديد من قواعد البيانات مفتوحة 
+الرجاء إختيار قاعدة البيانات الصحيحة لحفظ المسوغات </translation>
     </message>
 </context>
 <context>
@@ -597,19 +600,19 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>&amp;Google Chrome</source>
-        <translation>&amp;Google Chrome</translation>
+        <translation>&amp;قوقل كروم</translation>
     </message>
     <message>
         <source>&amp;Firefox</source>
-        <translation>&amp;Firefox</translation>
+        <translation>&amp;فايرفوكس</translation>
     </message>
     <message>
         <source>&amp;Chromium</source>
-        <translation>&amp;Chromium</translation>
+        <translation>&amp;كروميوم</translation>
     </message>
     <message>
         <source>&amp;Vivaldi</source>
-        <translation>&amp;Vivaldi</translation>
+        <translation>&amp;فافيلادي</translation>
     </message>
     <message>
         <source>Show a &amp;notification when credentials are requested</source>
@@ -713,20 +716,20 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>&amp;Tor Browser</source>
-        <translation type="unfinished"/>
+        <translation>متصفح تور</translation>
     </message>
     <message>
         <source>Executable Files</source>
-        <translation type="unfinished"/>
+        <translation> ملفات برامج </translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation type="unfinished"/>
+        <translation> جميع الملفات</translation>
     </message>
     <message>
         <source>Do not ask permission for HTTP &amp;Basic Auth</source>
         <extracomment>An extra HTTP Basic Auth setting</extracomment>
-        <translation type="unfinished"/>
+        <translation> لا تطلب الإذن لصفحات النترنت العادية HTTP&amp; و عند الإذن الأساسي</translation>
     </message>
     <message>
         <source>Due to Snap sandboxing, you must run a script to enable browser integration.&lt;br /&gt;You can obtain this script from %1</source>
@@ -742,7 +745,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>&amp;Brave</source>
-        <translation type="unfinished"/>
+        <translation> متصفح &amp;Brave</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
@@ -3477,7 +3480,7 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>  تمام</translation>
     </message>
     <message>
         <source>Already Exists</source>
@@ -4477,7 +4480,7 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
     <message>
         <source>Copy &amp;password</source>
-        <translation type="unfinished"/>
+        <translation> نسخ و كلمة السر</translation>
     </message>
     <message>
         <source>Perform &amp;Auto-Type</source>
diff --git a/share/translations/keepassx_ca.ts b/share/translations/keepassx_ca.ts
index 056f4b0b03..beadb94e4c 100644
--- a/share/translations/keepassx_ca.ts
+++ b/share/translations/keepassx_ca.ts
@@ -116,7 +116,7 @@
     </message>
     <message>
         <source>Start only a single instance of KeePassXC</source>
-        <translation>Obriu només una sola instància del KeePassXC</translation>
+        <translation>Obre només una sola instància del KeePassXC</translation>
     </message>
     <message>
         <source>Minimize window at application startup</source>
@@ -136,7 +136,7 @@
     </message>
     <message>
         <source>Automatically save after every change</source>
-        <translation>Deseu després de cada canvi de forma automàtica</translation>
+        <translation>Desa després de cada canvi de forma automàtica</translation>
     </message>
     <message>
         <source>Automatically save on exit</source>
@@ -144,11 +144,11 @@
     </message>
     <message>
         <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>No marqueu la base de dades com a modificada si no han hagut canvis en les dades (per exemple, a l&apos;expandir grups)</translation>
+        <translation>No marquis la base de dades com a modificada si no hi han hagut canvis en les dades (per exemple, a l&apos;expandir grups)</translation>
     </message>
     <message>
         <source>Automatically reload the database when modified externally</source>
-        <translation>Torneu a carregar automàticament la base de dades quan siga modificada de forma externa</translation>
+        <translation>Torna a carregar automàticament la base de dades quan sigui modificada de forma externa</translation>
     </message>
     <message>
         <source>Entry Management</source>
@@ -334,7 +334,7 @@
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation>Bloquegeu les bases de dades després d&apos;estar inactives per</translation>
+        <translation>Bloqueja les bases de dades després d&apos;estar inactives</translation>
     </message>
     <message>
         <source> min</source>
@@ -350,7 +350,7 @@
     </message>
     <message>
         <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Bloquegeu les bases de dades quan sessió siga bloquejada o es tanque la tapa</translation>
+        <translation>Bloqueja les bases de dades quan la sessió sigui bloquejada o es tanqui la tapa</translation>
     </message>
     <message>
         <source>Forget TouchID when session is locked or lid is closed</source>
@@ -358,7 +358,7 @@
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
-        <translation>Bloquegeu les bases de dades després minimitzar la finestra</translation>
+        <translation>Bloqueja les bases de dades després minimitzar la finestra</translation>
     </message>
     <message>
         <source>Re-lock previously locked database after performing Auto-Type</source>
@@ -411,7 +411,7 @@
     </message>
     <message>
         <source>Clear search query after</source>
-        <translation type="unfinished"/>
+        <translation>Elimina la teva cerca després de</translation>
     </message>
 </context>
 <context>
@@ -434,15 +434,15 @@
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Aquesta ordre de compleció automàtica conté un retard molt llarg. Esteu segur que voleu continuar?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Aquesta comanda de compleció automàtica conté pulsacions de tecles molt lentes. Esteu segur que voleu continuar?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Aquesta comanda de compleció automàtica conté arguments que es repeteixen molt sovint. Esteu segur que voleu continuar?</translation>
     </message>
     <message>
         <source>Permission Required</source>
@@ -574,7 +574,8 @@ Seleccioneu si voleu permetre l&apos;accés.</translation>
     <message>
         <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Teniu diverses bases de dades obertes.
+Seleccioneu la base de dades correcta per desar les credencials.</translation>
     </message>
 </context>
 <context>
@@ -675,11 +676,11 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
-        <translation type="unfinished"/>
+        <translation>Actualitza la ruta binària de KeePassXC o keepassxc-proxy automàticament als scripts de missatgeria nativa a l&apos;inici.</translation>
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation type="unfinished"/>
+        <translation>Actualitza el fitxers de manifest de la missatgeria &amp;nativa a l&apos;inici</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
@@ -738,7 +739,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2. %3</source>
-        <translation type="unfinished"/>
+        <translation>Perquè funcioni la integració del navegador cal el KeePassXC-Browse.&lt;br&gt;Baixeu-lo de %1 i de %2. %3</translation>
     </message>
     <message>
         <source>&amp;Brave</source>
@@ -750,7 +751,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>&amp;Allow returning expired credentials.</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Permet el retorn de credencials caducades.</translation>
     </message>
     <message>
         <source>Enable browser integration</source>
@@ -758,7 +759,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Browsers installed as snaps are currently not supported.</source>
-        <translation type="unfinished"/>
+        <translation>Actualment, no s&apos;admeten els navegadors instal·lats com a Snaps.</translation>
     </message>
     <message>
         <source>All databases connected to the extension will return matching credentials.</source>
@@ -1167,7 +1168,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>TouchID for Quick Unlock</source>
-        <translation>TouchID per desbloquejar ràpidament</translation>
+        <translation>Usa el TouchID per desbloquejar ràpidament</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -1179,7 +1180,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Unlock failed and no password given</source>
-        <translation type="unfinished"/>
+        <translation>El desbloqueig ha fallat i no s&apos;ha donat cap contrasenya</translation>
     </message>
     <message>
         <source>Unlocking the database failed and you did not enter a password.
@@ -1306,7 +1307,7 @@ This may prevent connection to the browser plugin.</source>
     </message>
     <message>
         <source>Enable Browser Integration to access these settings.</source>
-        <translation type="unfinished"/>
+        <translation>Permet que la integració del navegador accedeixi a aquesta configuració.</translation>
     </message>
     <message>
         <source>Disconnect all browsers</source>
@@ -1594,7 +1595,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation>Configuració de l&apos;historial</translation>
     </message>
     <message>
         <source>Max. history items:</source>
@@ -1937,7 +1938,7 @@ This is definitely a bug, please report it to the developers.</source>
     </message>
     <message>
         <source>Export database to HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Exporta la base de dades a un fitxer HTML</translation>
     </message>
     <message>
         <source>HTML file</source>
@@ -2034,11 +2035,11 @@ Voleu fusionar els canvis?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to delete %n entry(s) for good?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Esteu segur que voleu suprimir% n entrades per al Good?</numerusform><numerusform>Esteu segur que voleu suprimir %n entrada/es permanentment?</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>Delete entry(s)?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Voleu suprimir les entrades?</numerusform><numerusform>Voleu suprimir la/es entrada/es?</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>Move entry(s) to recycle bin?</source>
@@ -2102,7 +2103,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message numerus="yes">
         <source>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>L&apos;entrada &quot;%1&quot; té %2 referències. Voleu sobreescriure les referències amb valors, ometre aquesta entrada o suprimir igualment?</numerusform><numerusform>L&apos;entrada &quot;%1&quot; té %2 referència/es. Voleu sobreescriure les referències amb valors, ometre aquesta entrada, o suprimir igualment?</numerusform></translation>
     </message>
     <message>
         <source>Delete group</source>
@@ -2126,7 +2127,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Shared group...</source>
-        <translation type="unfinished"/>
+        <translation>Grup compartit...</translation>
     </message>
     <message>
         <source>Writing the database failed: %1</source>
@@ -2181,7 +2182,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>File too large to be a private key</source>
-        <translation type="unfinished"/>
+        <translation>Fitxer massa gran per ser una clau privada</translation>
     </message>
     <message>
         <source>Failed to open private key</source>
@@ -2603,7 +2604,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
-        <translation type="unfinished"/>
+        <translation>Elimina la clau de l&apos;agent quan la base de dades està tancada/bloquejada</translation>
     </message>
     <message>
         <source>Public key</source>
@@ -2611,7 +2612,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Add key to agent when database is opened/unlocked</source>
-        <translation type="unfinished"/>
+        <translation>Afegeix la clau a l&apos;agent quan la base de dades s&apos;obri o es desbloquegi</translation>
     </message>
     <message>
         <source>Comment</source>
@@ -2942,7 +2943,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>No icons were loaded</source>
-        <translation type="unfinished"/>
+        <translation>No s&apos;ha carrega cap icona</translation>
     </message>
     <message numerus="yes">
         <source>%n icon(s) already exist in the database</source>
@@ -2954,7 +2955,7 @@ Supported extensions are: %1.</source>
     </message>
     <message numerus="yes">
         <source>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Aquesta icona s&apos;utilitza en% n entrada (s), i serà substituïda per la icona per defecte. Esteu segur que voleu suprimir-la?</numerusform><numerusform>Aquesta icona s&apos;usa en %n entrada/es, i serà substituïda per la icona per defecte. Esteu segur que voleu suprimir-la?</numerusform></translation>
     </message>
     <message>
         <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
@@ -2970,7 +2971,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Apply icon &amp;to ...</source>
-        <translation type="unfinished"/>
+        <translation>Usa la &amp;icona a...</translation>
     </message>
     <message>
         <source>Apply to this only</source>
@@ -3013,7 +3014,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Plugin Data</source>
-        <translation type="unfinished"/>
+        <translation>Dades del connector</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -3065,7 +3066,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>Entry</name>
     <message>
         <source>%1 - Clone</source>
-        <translation type="unfinished"/>
+        <translation>%1 - Clon</translation>
     </message>
 </context>
 <context>
@@ -3076,7 +3077,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"/>
+        <translation>Mida</translation>
     </message>
 </context>
 <context>
@@ -3111,12 +3112,13 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Save attachments</source>
-        <translation type="unfinished"/>
+        <translation>Desa els fitxers adjunts</translation>
     </message>
     <message>
         <source>Unable to create directory:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>No s&apos;ha pogut crear el directori:
+%1</translation>
     </message>
     <message>
         <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
@@ -3124,7 +3126,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Confirm overwrite</source>
-        <translation type="unfinished"/>
+        <translation>Confirma la sobreescriptura</translation>
     </message>
     <message>
         <source>Unable to save attachments:
@@ -3143,7 +3145,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Confirm remove</source>
-        <translation type="unfinished"/>
+        <translation>Confirma l&apos;eliminació</translation>
     </message>
     <message numerus="yes">
         <source>Unable to open file(s):
@@ -3254,7 +3256,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"/>
+        <translation>Sí</translation>
     </message>
     <message>
         <source>TOTP</source>
@@ -3329,12 +3331,12 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
+        <translation>[PROTEGIT]</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
         <comment>attributes line</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -3346,7 +3348,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Share</source>
-        <translation type="unfinished"/>
+        <translation>Comparteix</translation>
     </message>
     <message>
         <source>Display current TOTP value</source>
@@ -3361,7 +3363,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>EntryView</name>
     <message>
         <source>Customize View</source>
-        <translation type="unfinished"/>
+        <translation>Personalitza la visualització</translation>
     </message>
     <message>
         <source>Hide Usernames</source>
@@ -3373,19 +3375,19 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <translation>Ajusta a la finestra</translation>
     </message>
     <message>
         <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <translation>Ajusta al contingut</translation>
     </message>
     <message>
         <source>Reset to defaults</source>
-        <translation type="unfinished"/>
+        <translation>Reinicialitza-la als valors predeterminats</translation>
     </message>
     <message>
         <source>Attachments (icon)</source>
-        <translation type="unfinished"/>
+        <translation>Fitxers adjunts (icona)</translation>
     </message>
 </context>
 <context>
@@ -3419,14 +3421,14 @@ This may cause the affected plugins to malfunction.</source>
     <message>
         <source>[empty]</source>
         <comment>group has no children</comment>
-        <translation type="unfinished"/>
+        <translation>[buit]</translation>
     </message>
 </context>
 <context>
     <name>HostInstaller</name>
     <message>
         <source>KeePassXC: Cannot save file!</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: no s&apos;ha pogut desar el fitxer!</translation>
     </message>
     <message>
         <source>Cannot save the native messaging script file.</source>
@@ -3512,19 +3514,19 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Header doesn&apos;t match hash</source>
-        <translation type="unfinished"/>
+        <translation>La capçalera no coincideix amb el hash</translation>
     </message>
     <message>
         <source>Invalid header id size</source>
-        <translation type="unfinished"/>
+        <translation>Mida de l&apos;id de capçalera no vàlid</translation>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"/>
+        <translation>Longitud del camp de capçalera no vàlid</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
-        <translation type="unfinished"/>
+        <translation>Longitud de dades de la capçalera no vàlida</translation>
     </message>
     <message>
         <source>Invalid credentials were provided, please try again.
@@ -3567,15 +3569,15 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Invalid header id size</source>
-        <translation type="unfinished"/>
+        <translation>Mida de l&apos;id de capçalera no vàlid</translation>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"/>
+        <translation>Longitud del camp de capçalera no vàlid</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
-        <translation type="unfinished"/>
+        <translation>Longitud de dades de la capçalera no vàlida</translation>
     </message>
     <message>
         <source>Failed to open buffer for KDF parameters in header</source>
@@ -3591,7 +3593,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Invalid inner header id size</source>
-        <translation type="unfinished"/>
+        <translation>Mida de l&apos;identificador intern d&apos;encapçalament no vàlida</translation>
     </message>
     <message>
         <source>Invalid inner header field length</source>
@@ -3793,7 +3795,7 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
     </message>
     <message>
         <source>Invalid EnableAutoType value</source>
-        <translation>Valor d&apos;EnableAutoType invàlid</translation>
+        <translation>Valor no vàlid de compleció automàtica</translation>
     </message>
     <message>
         <source>Invalid EnableSearching value</source>
@@ -4071,7 +4073,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Exported to %1</source>
-        <translation type="unfinished"/>
+        <translation>Exportat a %1</translation>
     </message>
     <message>
         <source>Synchronized with %1</source>
@@ -4079,11 +4081,11 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Import is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>La importació està inhabilitada a la configuració</translation>
     </message>
     <message>
         <source>Export is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;exportació està deshabilitada a la configuració</translation>
     </message>
     <message>
         <source>Inactive share</source>
@@ -4095,7 +4097,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Exported to</source>
-        <translation type="unfinished"/>
+        <translation>Exportat a</translation>
     </message>
     <message>
         <source>Synchronized with</source>
@@ -4410,7 +4412,7 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
     <message>
         <source>&amp;Import</source>
-        <translation type="unfinished"/>
+        <translation>&amp; Importa</translation>
     </message>
     <message>
         <source>Copy att&amp;ribute...</source>
@@ -4446,11 +4448,11 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
     <message>
         <source>&amp;Edit entry</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Edita l&apos;entrada</translation>
     </message>
     <message>
         <source>View or edit entry</source>
-        <translation type="unfinished"/>
+        <translation>Mostra o edita l&apos;entrada</translation>
     </message>
     <message>
         <source>&amp;New group</source>
@@ -4466,7 +4468,7 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
     <message>
         <source>&amp;Database settings...</source>
-        <translation type="unfinished"/>
+        <translation>Configuració de la base de &amp;dades...</translation>
     </message>
     <message>
         <source>Copy &amp;password</source>
@@ -4474,7 +4476,7 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
     <message>
         <source>Perform &amp;Auto-Type</source>
-        <translation>Realitza una compleció &amp;automàtic</translation>
+        <translation>Fes una compleció &amp;automàtica</translation>
     </message>
     <message>
         <source>Open &amp;URL</source>
@@ -4490,11 +4492,11 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
     <message>
         <source>CSV file...</source>
-        <translation type="unfinished"/>
+        <translation>Fitxer CSV...</translation>
     </message>
     <message>
         <source>Import a CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Importa un fitxer CSV</translation>
     </message>
     <message>
         <source>Show TOTP...</source>
@@ -4524,7 +4526,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exporta</translation>
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
@@ -4552,7 +4554,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>&amp;Export to HTML file...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exporta a un fitxer HTML...</translation>
     </message>
     <message>
         <source>1Password Vault...</source>
@@ -4560,7 +4562,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Import a 1Password Vault</source>
-        <translation type="unfinished"/>
+        <translation>Importa un 1Password Vault</translation>
     </message>
     <message>
         <source>&amp;Getting Started</source>
@@ -4836,7 +4838,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Passphrase is required to decrypt this key</source>
-        <translation type="unfinished"/>
+        <translation>Cal la frase de contrasenya per desxifrar aquesta clau</translation>
     </message>
     <message>
         <source>Key derivation failed, key file corrupted?</source>
@@ -4844,7 +4846,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Decryption failed, wrong passphrase?</source>
-        <translation type="unfinished"/>
+        <translation>El desxifrat ha fallat, la frase de contrasenya és errònia?</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading public key</source>
@@ -4982,7 +4984,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Exclude look-alike characters</source>
-        <translation>Excloure caràcters d&apos;aspecte semblant</translation>
+        <translation>Exclou caràcters d&apos;aspecte similar</translation>
     </message>
     <message>
         <source>Pick characters from every group</source>
@@ -4994,7 +4996,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Passphrase</source>
-        <translation>Contrasenya</translation>
+        <translation>Frase de contrasenya</translation>
     </message>
     <message>
         <source>Wordlist:</source>
@@ -5150,11 +5152,11 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Upper-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Lletra majúscula</translation>
     </message>
     <message>
         <source>Lower-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Lletra minúscula</translation>
     </message>
     <message>
         <source>Special characters</source>
@@ -5170,7 +5172,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Excluded characters</source>
-        <translation type="unfinished"/>
+        <translation>Caràcters exclosos</translation>
     </message>
     <message>
         <source>Hex Passwords</source>
@@ -5198,11 +5200,11 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>lower case</source>
-        <translation type="unfinished"/>
+        <translation>minúscules</translation>
     </message>
     <message>
         <source>UPPER CASE</source>
-        <translation type="unfinished"/>
+        <translation>MAJÚSCULES</translation>
     </message>
     <message>
         <source>Title Case</source>
@@ -5376,7 +5378,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Edit an entry.</source>
-        <translation type="unfinished"/>
+        <translation>Edita una entrada.</translation>
     </message>
     <message>
         <source>Title for the entry.</source>
@@ -5384,11 +5386,11 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>title</source>
-        <translation type="unfinished"/>
+        <translation>títol</translation>
     </message>
     <message>
         <source>Path of the entry to edit.</source>
-        <translation type="unfinished"/>
+        <translation>Ruta de l&apos;entrada a editar.</translation>
     </message>
     <message>
         <source>Estimate the entropy of a password.</source>
@@ -5400,7 +5402,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Perform advanced analysis on the password.</source>
-        <translation type="unfinished"/>
+        <translation>Fes una anàlisi avançada de la contrasenya.</translation>
     </message>
     <message>
         <source>WARNING: You are using a legacy key file format which may become
@@ -5530,16 +5532,17 @@ Available commands:
     </message>
     <message>
         <source>Generate a new random diceware passphrase.</source>
-        <translation type="unfinished"/>
+        <translation>Genera una frase de contrasenya nova amb llançament de daus.</translation>
     </message>
     <message>
         <source>Word count for the diceware passphrase.</source>
-        <translation type="unfinished"/>
+        <translation>Recompte de paraules per a la frase de contrasenya amb llançament de daus.</translation>
     </message>
     <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
-        <translation type="unfinished"/>
+        <translation>Llista de paraules per al generador de llançament de daus.
+[Per defecte: EFF English]</translation>
     </message>
     <message>
         <source>Generate a new random password.</source>
@@ -5620,7 +5623,7 @@ Available commands:
     </message>
     <message>
         <source>Successfully edited entry %1.</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;entrada %1 s&apos;ha editat correctament.</translation>
     </message>
     <message>
         <source>Length %1</source>
@@ -5728,35 +5731,35 @@ Available commands:
     </message>
     <message>
         <source>Length of the generated password</source>
-        <translation type="unfinished"/>
+        <translation>Longitud de la contrasenya generada</translation>
     </message>
     <message>
         <source>Use lowercase characters</source>
-        <translation type="unfinished"/>
+        <translation>Usa caràcters en minúscula</translation>
     </message>
     <message>
         <source>Use uppercase characters</source>
-        <translation type="unfinished"/>
+        <translation>Usa caràcters en majúscules</translation>
     </message>
     <message>
         <source>Use special characters</source>
-        <translation type="unfinished"/>
+        <translation>Usa caràcters especials</translation>
     </message>
     <message>
         <source>Use extended ASCII</source>
-        <translation type="unfinished"/>
+        <translation>Usa l&apos;ASCII ampliat</translation>
     </message>
     <message>
         <source>Exclude character set</source>
-        <translation type="unfinished"/>
+        <translation>Exclou el conjunt de caràcters</translation>
     </message>
     <message>
         <source>chars</source>
-        <translation type="unfinished"/>
+        <translation>caràcters</translation>
     </message>
     <message>
         <source>Exclude similar looking characters</source>
-        <translation type="unfinished"/>
+        <translation>Exclou caràcters d&apos;aspecte similar</translation>
     </message>
     <message>
         <source>Include characters from every selected group</source>
@@ -5790,7 +5793,7 @@ Available commands:
     </message>
     <message>
         <source>Successfully deleted entry %1.</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;entrada %1 s&apos;ha suprimit correctament.</translation>
     </message>
     <message>
         <source>Show the entry&apos;s current TOTP.</source>
@@ -5810,7 +5813,7 @@ Available commands:
     </message>
     <message>
         <source>file empty</source>
-        <translation type="unfinished"/>
+        <translation>fitxer buit</translation>
     </message>
     <message>
         <source>%1: (row, col) %2,%3</source>
@@ -5818,15 +5821,15 @@ Available commands:
     </message>
     <message>
         <source>AES: 256-bit</source>
-        <translation type="unfinished"/>
+        <translation>AES: 256-bit</translation>
     </message>
     <message>
         <source>Twofish: 256-bit</source>
-        <translation type="unfinished"/>
+        <translation>Twofish: 256-bit</translation>
     </message>
     <message>
         <source>ChaCha20: 256-bit</source>
-        <translation type="unfinished"/>
+        <translation>ChaCha20:256-bits</translation>
     </message>
     <message>
         <source>Argon2 (KDBX 4 – recommended)</source>
@@ -5834,21 +5837,21 @@ Available commands:
     </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
-        <translation type="unfinished"/>
+        <translation>AES-KDF (KDBX 4)</translation>
     </message>
     <message>
         <source>AES-KDF (KDBX 3.1)</source>
-        <translation type="unfinished"/>
+        <translation>AES-KDF (KDBX 3,1)</translation>
     </message>
     <message>
         <source>Invalid Settings</source>
         <comment>TOTP</comment>
-        <translation type="unfinished"/>
+        <translation>La configuració no és vàlida</translation>
     </message>
     <message>
         <source>Invalid Key</source>
         <comment>TOTP</comment>
-        <translation type="unfinished"/>
+        <translation>Clau invàlida</translation>
     </message>
     <message>
         <source>Message encryption failed.</source>
@@ -5860,7 +5863,7 @@ Available commands:
     </message>
     <message>
         <source>Create a new database.</source>
-        <translation type="unfinished"/>
+        <translation>Crea una nova base de dades.</translation>
     </message>
     <message>
         <source>File %1 already exists.</source>
@@ -5892,7 +5895,7 @@ Available commands:
     </message>
     <message>
         <source>Path of the entry to remove.</source>
-        <translation type="unfinished"/>
+        <translation>Ruta de l&apos;entrada a eliminar.</translation>
     </message>
     <message>
         <source>Existing single-instance lock file is invalid. Launching new instance.</source>
@@ -6100,7 +6103,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
-        <translation type="unfinished"/>
+        <translation>Format a utilitzar en l&apos;exportació. Les opcions disponibles són XML o CSV. Per defect s&apos;usa XML.</translation>
     </message>
     <message>
         <source>Exports the content of a database to standard output in the specified format.</source>
@@ -6348,31 +6351,31 @@ Nucli: %3 %4</translation>
     <name>SearchHelpWidget</name>
     <message>
         <source>Search Help</source>
-        <translation type="unfinished"/>
+        <translation>Cerca l&apos;ajuda</translation>
     </message>
     <message>
         <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
-        <translation type="unfinished"/>
+        <translation>Els termes de cerca són així: [Modificadors] [camp:] [&quot;] terme [&quot;]</translation>
     </message>
     <message>
         <source>Every search term must match (ie, logical AND)</source>
-        <translation type="unfinished"/>
+        <translation>Cada terme de cerca ha de coincidir (p.e. I lògica)</translation>
     </message>
     <message>
         <source>Modifiers</source>
-        <translation type="unfinished"/>
+        <translation>Modificadors</translation>
     </message>
     <message>
         <source>exclude term from results</source>
-        <translation type="unfinished"/>
+        <translation>exclou el terme dels resultats</translation>
     </message>
     <message>
         <source>match term exactly</source>
-        <translation type="unfinished"/>
+        <translation>el terme ha de coincidir exactament</translation>
     </message>
     <message>
         <source>use regex in term</source>
-        <translation type="unfinished"/>
+        <translation>usa regex al terme</translation>
     </message>
     <message>
         <source>Fields</source>
@@ -6380,19 +6383,19 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Term Wildcards</source>
-        <translation type="unfinished"/>
+        <translation>Comodins</translation>
     </message>
     <message>
         <source>match anything</source>
-        <translation type="unfinished"/>
+        <translation>concorda amb qualsevol cosa</translation>
     </message>
     <message>
         <source>match one</source>
-        <translation type="unfinished"/>
+        <translation>coincideix amb un</translation>
     </message>
     <message>
         <source>logical OR</source>
-        <translation type="unfinished"/>
+        <translation>operador lògic O</translation>
     </message>
     <message>
         <source>Examples</source>
@@ -6415,7 +6418,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Search Help</source>
-        <translation type="unfinished"/>
+        <translation>Cerca l&apos;ajuda</translation>
     </message>
     <message>
         <source>Search (%1)...</source>
@@ -6530,7 +6533,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Own certificate</source>
-        <translation type="unfinished"/>
+        <translation>Certificat propi</translation>
     </message>
     <message>
         <source>Fingerprint:</source>
@@ -6538,11 +6541,11 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Certificate:</source>
-        <translation type="unfinished"/>
+        <translation>Certificat:</translation>
     </message>
     <message>
         <source>Signer</source>
-        <translation type="unfinished"/>
+        <translation>Signant</translation>
     </message>
     <message>
         <source>Key:</source>
@@ -6594,7 +6597,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Certificate</source>
-        <translation type="unfinished"/>
+        <translation>Certificat</translation>
     </message>
     <message>
         <source>Trusted</source>
@@ -6627,23 +6630,23 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Exporting changed certificate</source>
-        <translation type="unfinished"/>
+        <translation>Exportant el certificat modificat</translation>
     </message>
     <message>
         <source>The exported certificate is not the same as the one in use. Do you want to export the current certificate?</source>
-        <translation type="unfinished"/>
+        <translation>El certificat exportat no és el mateix que el que està en ús. Voleu exportar el certificat actual?</translation>
     </message>
     <message>
         <source>Signer:</source>
-        <translation type="unfinished"/>
+        <translation>Signant:</translation>
     </message>
     <message>
         <source>Allow KeeShare imports</source>
-        <translation type="unfinished"/>
+        <translation>Permet les importacions de KeeShare</translation>
     </message>
     <message>
         <source>Allow KeeShare exports</source>
-        <translation type="unfinished"/>
+        <translation>Permet les exportacions de KeeShare</translation>
     </message>
     <message>
         <source>Only show warnings and errors</source>
@@ -6741,7 +6744,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Import from container with certificate</source>
-        <translation type="unfinished"/>
+        <translation>Importa des del contenidor amb certificat</translation>
     </message>
     <message>
         <source>Do you want to trust %1 with the fingerprint of %2 from %3?</source>
@@ -6820,11 +6823,11 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Export to %1 failed (%2)</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;exportació a %1 ha fallat (%2)</translation>
     </message>
     <message>
         <source>Export to %1 successful (%2)</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;exportació a %1 s&apos;ha realitzat amb èxit (%2)</translation>
     </message>
     <message>
         <source>Export to %1</source>
@@ -6952,7 +6955,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Are you sure you want to delete TOTP settings for this entry?</source>
-        <translation type="unfinished"/>
+        <translation>Esteu segur que voleu suprimir la configuració TOTP de l&apos;entrada?</translation>
     </message>
 </context>
 <context>
@@ -7038,7 +7041,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Importa des de 1Password</translation>
     </message>
     <message>
         <source>Open a recent database</source>
diff --git a/share/translations/keepassx_da.ts b/share/translations/keepassx_da.ts
index 09a74ecb02..5c46b36a9f 100644
--- a/share/translations/keepassx_da.ts
+++ b/share/translations/keepassx_da.ts
@@ -3462,7 +3462,7 @@ Det kan få de påvirkede plugins til at svigte.</translation>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation type="unfinished"/>
+        <translation>Download faviconer</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -4556,27 +4556,27 @@ Forvent nogle fejl og mindre problemer. Denne version er ikke beregnet til produ
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Eksportér</translation>
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Søg efter opdateringer ...</translation>
     </message>
     <message>
         <source>Downlo&amp;ad all favicons</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Download alle faviconer</translation>
     </message>
     <message>
         <source>Sort &amp;A-Z</source>
-        <translation type="unfinished"/>
+        <translation>Sortér &amp;A-Å</translation>
     </message>
     <message>
         <source>Sort &amp;Z-A</source>
-        <translation type="unfinished"/>
+        <translation>Sortér &amp;Å-A</translation>
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Adgangskodegenerator</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4584,19 +4584,19 @@ Forvent nogle fejl og mindre problemer. Denne version er ikke beregnet til produ
     </message>
     <message>
         <source>&amp;Export to HTML file...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Eksportér til HTML-fil ...</translation>
     </message>
     <message>
         <source>1Password Vault...</source>
-        <translation type="unfinished"/>
+        <translation>1Password-boks ...</translation>
     </message>
     <message>
         <source>Import a 1Password Vault</source>
-        <translation type="unfinished"/>
+        <translation>Importér en 1Password-boks</translation>
     </message>
     <message>
         <source>&amp;Getting Started</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Kom godt i gang</translation>
     </message>
     <message>
         <source>Open Getting Started Guide PDF</source>
@@ -4604,7 +4604,7 @@ Forvent nogle fejl og mindre problemer. Denne version er ikke beregnet til produ
     </message>
     <message>
         <source>&amp;Online Help...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Onlinehjælp ...</translation>
     </message>
     <message>
         <source>Go to online documentation (opens browser)</source>
@@ -4612,7 +4612,7 @@ Forvent nogle fejl og mindre problemer. Denne version er ikke beregnet til produ
     </message>
     <message>
         <source>&amp;User Guide</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Brugerguide</translation>
     </message>
     <message>
         <source>Open User Guide PDF</source>
@@ -4620,7 +4620,7 @@ Forvent nogle fejl og mindre problemer. Denne version er ikke beregnet til produ
     </message>
     <message>
         <source>&amp;Keyboard Shortcuts</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tastaturgenveje</translation>
     </message>
 </context>
 <context>
@@ -7077,7 +7077,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Importér fra 1Password</translation>
     </message>
     <message>
         <source>Open a recent database</source>
diff --git a/share/translations/keepassx_de.ts b/share/translations/keepassx_de.ts
index 264653ce31..29b765a6ba 100644
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
@@ -574,8 +574,8 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
     <message>
         <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
-        <translation>Du hast mehrere Datenbanken geöffnet.
-Bitte wähle die richtige Datenbank zum speichern der Anmeldedaten.</translation>
+        <translation>Sie haben mehrere Datenbanken geöffnet.
+Bitte wählen Sie die richtige Datenbank zum Speichern der Anmeldedaten.</translation>
     </message>
 </context>
 <context>
@@ -1070,7 +1070,7 @@ Sicherungsdatenbank bei %2</translation>
     </message>
     <message>
         <source>Database file has unmerged changes.</source>
-        <translation>Die Datenbankdatei hat Änderungen die noch nicht gemergt wurden.</translation>
+        <translation>Die Datenbankdatei hat Änderungen die noch nicht zusammengeführt wurden.</translation>
     </message>
     <message>
         <source>Recycle Bin</source>
@@ -1217,7 +1217,7 @@ Um zu verhindern, dass dieser Fehler auftritt, müssen Sie zu &quot;Datenbankein
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Zusätzlich zu ihrem Masterpasswort können sie eine geheime Datei verwenden um die Sicherheit ihrer Datenbank zu erhöhen. Eine solche Datei kann in den Sicherheitseinstellung ihrer Datenbank generiert werden.&lt;/p&gt; &lt;p&gt;Diese Datei ist jedoch &lt;strong&gt;nicht&lt;/strong&gt; Ihre *.kdbx Datei!&lt;br&gt; Wenn sie keine Schlüsseldatei haben lassen sie das Feld leer.&lt;/p&gt; &lt;p&gt;Klicken sie hier für weitere Informationen...&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Zusätzlich zu Ihrem Masterpasswort können Sie eine geheime Datei verwenden, um die Sicherheit Ihrer Datenbank zu erhöhen. Eine solche Datei kann in den Sicherheitseinstellungen Ihrer Datenbank generiert werden.&lt;/p&gt; &lt;p&gt;Diese Datei ist jedoch &lt;strong&gt;nicht&lt;/strong&gt; Ihre *.kdbx-Datei!&lt;br&gt; Wenn Sie keine Schlüsseldatei haben, lassen Sie das Feld leer.&lt;/p&gt; &lt;p&gt;Klicken Sie hier für weitere Informationen...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Key file help</source>
@@ -1331,7 +1331,7 @@ Das wird die Verbindung zum Browser-Plugin verhindern.</translation>
     <message>
         <source>Do you really want to disconnect all browsers?
 This may prevent connection to the browser plugin.</source>
-        <translation>Möchtest du wirklich alle Browserverbindungen entfernen?
+        <translation>Möchten Sie wirklich alle Browserverbindungen entfernen?
 Das wird die Verbindung zu dem Browser-Plugin verhindern.</translation>
     </message>
     <message>
@@ -3094,7 +3094,7 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
     <name>Entry</name>
     <message>
         <source>%1 - Clone</source>
-        <translation>%1 - Kopie</translation>
+        <translation>%1 - Klon</translation>
     </message>
 </context>
 <context>
@@ -3608,7 +3608,7 @@ Falls dies wiederholt passiert, dann könnte Ihre Datenbank beschädigt sein.</t
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation>Ungültiger Header-Feldlänge</translation>
+        <translation>Ungültige Header-Feldlänge</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
@@ -4451,8 +4451,8 @@ Diese Version ist nicht für den Produktiveinsatz gedacht.</translation>
     <message>
         <source>WARNING: Your Qt version may cause KeePassXC to crash with an On-Screen Keyboard!
 We recommend you use the AppImage available on our downloads page.</source>
-        <translation>WARNUNG: Deine Qt Version könnte KeePassXC mit einer Bildschirmtastatur zu abstürzen bringen!
-Wir empfehlen dir die Verwendung des auf unserer Downloadseite verfügbaren AppImage.</translation>
+        <translation>WARNUNG: Ihre Qt Version könnte KeePassXC mit einer Bildschirmtastatur zu abstürzen bringen!
+Wir empfehlen Ihnen die Verwendung des auf unserer Downloadseite verfügbaren AppImage.</translation>
     </message>
     <message>
         <source>&amp;Import</source>
@@ -4665,7 +4665,7 @@ Da sie Fehler beinhalten könnte, ist diese Version nicht für den Produktiveins
     </message>
     <message>
         <source>Reapplying older target entry on top of newer source %1 [%2]</source>
-        <translation>Älterer Ziel-Eintrag wird auf neuere Quellen-Eintrag angewendet %1 [%2]</translation>
+        <translation>Älterer Ziel-Eintrag wird auf neueren Quellen-Eintrag angewendet %1 [%2]</translation>
     </message>
     <message>
         <source>Reapplying older source entry on top of newer target %1 [%2]</source>
@@ -4758,7 +4758,7 @@ Da sie Fehler beinhalten könnte, ist diese Version nicht für den Produktiveins
     </message>
     <message>
         <source>A master key known only to you protects your database.</source>
-        <translation>Ein nur dir bekannter Schlüssel schützt die Datenbank.</translation>
+        <translation>Ein nur Ihnen bekannter Schlüssel schützt die Datenbank.</translation>
     </message>
 </context>
 <context>
@@ -5287,7 +5287,7 @@ Da sie Fehler beinhalten könnte, ist diese Version nicht für den Produktiveins
     </message>
     <message>
         <source>Empty</source>
-        <translation>Leer</translation>
+        <translation>Leeren</translation>
     </message>
     <message>
         <source>Remove</source>
diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts
index dbcf769026..581eeb27c7 100644
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@@ -2340,6 +2340,14 @@ Disable safe saves and try again?</translation>
         <source>Are you sure you want to remove this URL?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reveal</source>
+        <translation type="unfinished">Reveal</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2521,6 +2529,14 @@ Disable safe saves and try again?</translation>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Only send this setting to the browser for HTTP Auth dialogs. If enabled, normal login forms will not show this entry for selection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use this entry only with HTTP Basic Auth</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -3455,6 +3471,13 @@ This may cause the affected plugins to malfunction.</translation>
         <translation type="unfinished">Advanced</translation>
     </message>
 </context>
+<context>
+    <name>EntryURLModel</name>
+    <message>
+        <source>Invalid URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EntryView</name>
     <message>
@@ -3508,6 +3531,40 @@ This may cause the affected plugins to malfunction.</translation>
         </translation>
     </message>
 </context>
+<context>
+    <name>FdoSecrets::SettingsDatabaseModel</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished">Group</translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlock to show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FdoSecrets::SettingsSessionModel</name>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FdoSecretsPlugin</name>
     <message>
@@ -4699,6 +4756,40 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ManageDatabase</name>
+    <message>
+        <source>Database settings</source>
+        <translation type="unfinished">Database settings</translation>
+    </message>
+    <message>
+        <source>Edit database settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlock database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlock database to show more information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock database</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ManageSession</name>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect this application</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Merger</name>
     <message>
@@ -6576,18 +6667,6 @@ Kernel: %3 %4</source>
         <source>Exposed database groups:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished">Group</translation>
-    </message>
-    <message>
-        <source>Manage</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Authorization</source>
         <translation type="unfinished"></translation>
@@ -6596,42 +6675,6 @@ Kernel: %3 %4</source>
         <source>These applications are currently connected:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Database settings</source>
-        <translation type="unfinished">Database settings</translation>
-    </message>
-    <message>
-        <source>Edit database settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlock database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlock database to show more information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lock database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlock to show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetKeeShare</name>
@@ -7077,6 +7120,13 @@ Example: JBSWY3DPEHPK3PXP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>URLEdit</name>
+    <message>
+        <source>Invalid URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>UpdateCheckDialog</name>
     <message>
diff --git a/share/translations/keepassx_es.ts b/share/translations/keepassx_es.ts
index e3de941c22..5ffd9701a6 100644
--- a/share/translations/keepassx_es.ts
+++ b/share/translations/keepassx_es.ts
@@ -73,7 +73,7 @@
     </message>
     <message>
         <source>Access error for config file %1</source>
-        <translation>Error de acceso al fichero de configuración %1</translation>
+        <translation>Error de acceso al archivo de configuración %1</translation>
     </message>
     <message>
         <source>Icon only</source>
@@ -124,15 +124,15 @@
     </message>
     <message>
         <source>File Management</source>
-        <translation>Administración de ficheros</translation>
+        <translation>Administración de archivos</translation>
     </message>
     <message>
         <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Guardar los ficheros de BB.DD. con seguridad (puede ser incompatible con Dropbox, etcétera)</translation>
+        <translation>Guardar los archivos de base de datos con seguridad (puede ser incompatible con Dropbox, etcétera)</translation>
     </message>
     <message>
         <source>Backup database file before saving</source>
-        <translation>Hacer una copia de seguridad de la BB.DD. antes de guardar</translation>
+        <translation>Hacer una copia de seguridad de la base de datos antes de guardar</translation>
     </message>
     <message>
         <source>Automatically save after every change</source>
@@ -144,23 +144,23 @@
     </message>
     <message>
         <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>No marcar la BB.DD. como modificada cuando los cambios no afecten a los datos (ej. expandir grupos)</translation>
+        <translation>No marcar la base de datos como modificada cuando los cambios no afecten a los datos (ej. expandir grupos)</translation>
     </message>
     <message>
         <source>Automatically reload the database when modified externally</source>
-        <translation>Recargar automáticamente la BB.DD. cuando sea modificada externamente</translation>
+        <translation>Recargar automáticamente la base de datos cuando sea modificada externamente</translation>
     </message>
     <message>
         <source>Entry Management</source>
-        <translation>Gestión de apunte</translation>
+        <translation>Gestión de la entrada</translation>
     </message>
     <message>
         <source>Use group icon on entry creation</source>
-        <translation>Utilizar icono del grupo en la creación de apunte</translation>
+        <translation>Utilizar icono del grupo en la creación de entrada</translation>
     </message>
     <message>
         <source>Hide the entry preview panel</source>
-        <translation>Ocultar apunte del panel de vista previa</translation>
+        <translation>Ocultar entrada del panel de vista previa</translation>
     </message>
     <message>
         <source>General</source>
@@ -188,15 +188,15 @@
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Autoescritura</translation>
+        <translation>Autotecleo</translation>
     </message>
     <message>
         <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Utilizar título del apunte para emparejar ventanas en autoescritura global</translation>
+        <translation>Utilizar título de la entrada para emparejar ventanas en autoescritura global</translation>
     </message>
     <message>
         <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Utilizar URL del apunte para emparejar ventanas en autoescritura global</translation>
+        <translation>Utilizar URL de la entrada para emparejar ventanas en autoescritura global</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
@@ -213,7 +213,7 @@
     <message>
         <source> ms</source>
         <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <translation> ms</translation>
     </message>
     <message>
         <source>Auto-Type start delay</source>
@@ -229,11 +229,11 @@
     </message>
     <message>
         <source>Load previously open databases on startup</source>
-        <translation>Abrir BB.DD. anterior al inicio</translation>
+        <translation>Abrir bases de datos anterior al inicio</translation>
     </message>
     <message>
         <source>Remember database key files and security dongles</source>
-        <translation>Recordar los últimos ficheros de llaves y los «dongle» de seguridad</translation>
+        <translation>Recordar las últimas cerraduras y los «dongle» de seguridad</translation>
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
@@ -257,7 +257,7 @@
     </message>
     <message>
         <source>Minimize window after unlocking database</source>
-        <translation>Minimizar ventana tras desbloquear BB.DD.</translation>
+        <translation>Minimizar ventana tras desbloquear base de datos.</translation>
     </message>
     <message>
         <source>Minimize when opening a URL</source>
@@ -286,7 +286,7 @@
     <message>
         <source> sec</source>
         <comment>Seconds</comment>
-        <translation>seg</translation>
+        <translation> seg</translation>
     </message>
     <message>
         <source>Toolbar button style</source>
@@ -330,11 +330,11 @@
     <message>
         <source> sec</source>
         <comment>Seconds</comment>
-        <translation>seg</translation>
+        <translation> seg</translation>
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation>Bloquear BB.DD. tras un periodo de inactividad de</translation>
+        <translation>Bloquear bases de datos tras un periodo de inactividad de</translation>
     </message>
     <message>
         <source> min</source>
@@ -350,7 +350,7 @@
     </message>
     <message>
         <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Bloquear BB.DD. cuando la sesión está bloqueada o la pantalla esté cerrada</translation>
+        <translation>Bloquear bases de datos cuando la sesión está bloqueada o la pantalla esté cerrada</translation>
     </message>
     <message>
         <source>Forget TouchID when session is locked or lid is closed</source>
@@ -358,11 +358,11 @@
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
-        <translation>Bloquear BB.DD. al minimizar la ventana</translation>
+        <translation>Bloquear bases de datos al minimizar la ventana</translation>
     </message>
     <message>
         <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Volver a bloquear la BB.DD. tras realizar una autoescritura</translation>
+        <translation>Rebloquear la base de datos tras realizar un autoescritura</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
@@ -378,11 +378,11 @@
     </message>
     <message>
         <source>Hide passwords in the entry preview panel</source>
-        <translation>Ocultar contraseñas en apunte del panel de vista previa</translation>
+        <translation>Ocultar contraseñas en la entrada del panel de vista previa</translation>
     </message>
     <message>
         <source>Hide entry notes by default</source>
-        <translation>Ocultar notas de apunte por defecto</translation>
+        <translation>Ocultar notas de la entrada por defecto</translation>
     </message>
     <message>
         <source>Privacy</source>
@@ -402,7 +402,7 @@
     </message>
     <message>
         <source>Database lock timeout seconds</source>
-        <translation>Tiempo de espera de bloqueo de BB.DD. en segundos</translation>
+        <translation>Tiempo de espera de bloqueo de base de datos en segundos</translation>
     </message>
     <message>
         <source> min</source>
@@ -418,31 +418,31 @@
     <name>AutoType</name>
     <message>
         <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>No se puede encontrar un apunte que corresponda al título de la ventana:</translation>
+        <translation>No se puede encontrar una entrada que corresponda al título de la ventana:</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Autoescritura - KeePassXC</translation>
+        <translation>Auto-teclear - KeePassXC</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Autoescritura</translation>
+        <translation>Auto-Teclear</translation>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation>¡La sintaxis de la sentencia de su autoescritura es incorrecta!</translation>
+        <translation>¡La sintaxis de la sentencia de su auto-tecleo es incorrecta!</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation>Este mandato de autoescritura contiene un retraso muy largo. ¿Desea continuar?</translation>
+        <translation>Este mandato de auto-tecleo contiene un retraso muy largo. ¿Desea continuar?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation>Este mandato de autoescritura contiene pulsaciones de teclas muy lentas. ¿Desea continuar?</translation>
+        <translation>Este mandato de auto-tecleo contiene pulsaciones de teclas muy lentas. ¿Desea continuar?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation>Este mandato de autoescritura contiene argumentos que se repiten muy a menudo. ¿Realmente desea continuar?</translation>
+        <translation>Este mandato de auto-tecleo contiene argumentos que se repiten muy a menudo. ¿Desea continuar?</translation>
     </message>
     <message>
         <source>Permission Required</source>
@@ -480,7 +480,7 @@
     </message>
     <message>
         <source>Username</source>
-        <translation>ID Usuario</translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <source>Sequence</source>
@@ -491,7 +491,7 @@
     <name>AutoTypeMatchView</name>
     <message>
         <source>Copy &amp;username</source>
-        <translation>Copiar nombre de &amp;usuario</translation>
+        <translation>Copiar &amp;usuario</translation>
     </message>
     <message>
         <source>Copy &amp;password</source>
@@ -513,15 +513,15 @@
     <name>AutoTypeSelectDialog</name>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Autoescritura - KeePassXC</translation>
+        <translation>Auto-Tecleo - KeePassXC</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Seleccionar apunte para autoescritura:</translation>
+        <translation>Seleccionar apunte para auto-teclear:</translation>
     </message>
     <message>
         <source>Search...</source>
-        <translation>Buscar...</translation>
+        <translation>Buscar…</translation>
     </message>
 </context>
 <context>
@@ -575,7 +575,7 @@ Seleccione si desea autorizar su acceso.</translation>
         <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
         <translation>Tiene múltiples bases de datos abiertas.
-Por favor, seleccione la BB.DD. correcta para guardar las credenciales.</translation>
+Por favor, seleccione la base de datos correcta para guardar las credenciales.</translation>
     </message>
 </context>
 <context>
@@ -619,19 +619,19 @@ Por favor, seleccione la BB.DD. correcta para guardar las credenciales.</transla
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Solicitar el desblo&amp;queo de la BB.DD. si se encuentra bloqueada</translation>
+        <translation>Solicitar el desblo&amp;queo de la base de datos si se encuentra bloqueada</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
-        <translation>Sólo se muestran las apuntes con el mismo esquema (http://, https://,...)</translation>
+        <translation>Sólo se muestran las entradas con el mismo esquema (http://, https://,...)</translation>
     </message>
     <message>
         <source>&amp;Match URL scheme (e.g., https://...)</source>
-        <translation>&amp;Coinciden con el esquema de URL (ej. https://...)</translation>
+        <translation>&amp;Coinciden con el esquema de URL (p.e. https://...)</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Sólo devolver los resultados similares para una URL específica en vez de todas las apuntes para todo el dominio.</translation>
+        <translation>Sólo devolver los resultados similares para una URL específica en vez de todas las entradas para todo el dominio.</translation>
     </message>
     <message>
         <source>&amp;Return only best-matching credentials</source>
@@ -640,12 +640,12 @@ Por favor, seleccione la BB.DD. correcta para guardar las credenciales.</transla
     <message>
         <source>Sort &amp;matching credentials by title</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Ordenar las credenciales por &amp;título</translation>
+        <translation>Ordenar credenciales por &amp;título</translation>
     </message>
     <message>
         <source>Sort matching credentials by &amp;username</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Ordenar las credenciales por &amp;usuario</translation>
+        <translation>Ordenar credenciales por &amp;usuario</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -680,7 +680,7 @@ Por favor, seleccione la BB.DD. correcta para guardar las credenciales.</transla
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation>Actualizar ficheros manifiesto de mensajería &amp;nativa al iniciar</translation>
+        <translation>Actualizar archivo manifiesto de mensajería &amp;nativa al iniciar</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
@@ -702,7 +702,7 @@ Por favor, seleccione la BB.DD. correcta para guardar las credenciales.</transla
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation>Explorar...</translation>
+        <translation>Explorar…</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
@@ -718,11 +718,11 @@ Por favor, seleccione la BB.DD. correcta para guardar las credenciales.</transla
     </message>
     <message>
         <source>Executable Files</source>
-        <translation>Ficheros ejecutables</translation>
+        <translation>Archivos ejecutables</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation>Todos los ficheros</translation>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
         <source>Do not ask permission for HTTP &amp;Basic Auth</source>
@@ -779,7 +779,7 @@ Por favor, seleccione la BB.DD. correcta para guardar las credenciales.</transla
     </message>
     <message>
         <source>Browser for custom proxy file</source>
-        <translation>Explorar para fichero personalizado proxy</translation>
+        <translation>Explorar para archivo personalizado proxy</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning&lt;/b&gt;, the keepassxc-proxy application was not found!&lt;br /&gt;Please check the KeePassXC installation directory or confirm the custom path in advanced options.&lt;br /&gt;Browser integration WILL NOT WORK without the proxy application.&lt;br /&gt;Expected Path: %1</source>
@@ -808,7 +808,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: actualizar apunte</translation>
+        <translation>KeePassXC: actualizar entrada</translation>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
@@ -838,11 +838,11 @@ Movió %2 claves a datos personalizados.</translation>
     </message>
     <message>
         <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
-        <translation>KeePassXC: ¡no se encontró apunte con los atributos KeePassHTTP!</translation>
+        <translation>KeePassXC: ¡no se encontró una entrada con los atributos KeePassHTTP!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
-        <translation>La BB.DD. activa no contiene un apunte con atributos de KeePassHTTP.</translation>
+        <translation>La base de datos activa no contiene una entrada con atributos de KeePassHTTP.</translation>
     </message>
     <message>
         <source>KeePassXC: Legacy browser integration settings detected</source>
@@ -864,9 +864,9 @@ Do you want to create this group?
         <source>Your KeePassXC-Browser settings need to be moved into the database settings.
 This is necessary to maintain your current browser connections.
 Would you like to migrate your existing settings now?</source>
-        <translation>Sus configuraciones de KeePassXC-Browser necesitan moverse a las configuraciones de BB.DD.
+        <translation>Sus configuraciones de KeePassXC-Browser necesitan moverse a las configuraciones de base de datos.
 Es necesario para mantener sus conexiones presentes del explorador.
-¿Le gustaría migrar sus configuraciones existentes ahora?</translation>
+¿Desea migrar sus configuraciones existentes ahora?</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
@@ -893,11 +893,11 @@ portatil-chrome.</translation>
     </message>
     <message>
         <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Agregar «- Clon» al título</translation>
+        <translation>Añadir «- Clon» al título</translation>
     </message>
     <message>
         <source>Replace username and password with references</source>
-        <translation>Reemplace usuario y contraseña con referencias</translation>
+        <translation>Reemplazar usuario y contraseña con referencias</translation>
     </message>
     <message>
         <source>Copy history</source>
@@ -912,7 +912,7 @@ portatil-chrome.</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation>nombre del fichero</translation>
+        <translation>nombre del archivo</translation>
     </message>
     <message>
         <source>size, rows, columns</source>
@@ -956,11 +956,11 @@ portatil-chrome.</translation>
     </message>
     <message>
         <source>Not present in CSV file</source>
-        <translation>No presente en el fichero CSV</translation>
+        <translation>No presente en el archivo CSV</translation>
     </message>
     <message>
         <source>Imported from CSV file</source>
-        <translation>Importado de un fichero CSV</translation>
+        <translation>Importado de un archivo CSV</translation>
     </message>
     <message>
         <source>Original data: </source>
@@ -980,7 +980,7 @@ portatil-chrome.</translation>
     </message>
     <message>
         <source>Error(s) detected in CSV file!</source>
-        <translation>¡Error(es) detectado(s) en el fichero CSV!</translation>
+        <translation>¡Error(es) detectado(s) en el archivo CSV!</translation>
     </message>
     <message numerus="yes">
         <source>[%n more message(s) skipped]</source>
@@ -1038,19 +1038,19 @@ portatil-chrome.</translation>
     </message>
     <message>
         <source>File %1 does not exist.</source>
-        <translation>El fichero %1 no existe.</translation>
+        <translation>El archivo %1 no existe.</translation>
     </message>
     <message>
         <source>Unable to open file %1.</source>
-        <translation>Incapaz de abrir el fichero %1.</translation>
+        <translation>Incapaz de abrir el archivo %1.</translation>
     </message>
     <message>
         <source>Error while reading the database: %1</source>
-        <translation>Error al leer la BB.DD.: %1</translation>
+        <translation>Error al leer la base de datos: %1</translation>
     </message>
     <message>
         <source>File cannot be written as it is opened in read-only mode.</source>
-        <translation>El fichero no se puede escribir, ya que se ha abierto en modo de solo lectura.</translation>
+        <translation>El archivo no se puede escribir, ya que se ha abierto en modo de solo lectura.</translation>
     </message>
     <message>
         <source>Key not transformed. This is a bug, please report it to the developers!</source>
@@ -1060,19 +1060,19 @@ portatil-chrome.</translation>
         <source>%1
 Backup database located at %2</source>
         <translation>%1
-Copiar de seguridad de BB.DD. ubicada en %2</translation>
+Copiar de seguridad de base de datos ubicada en %2</translation>
     </message>
     <message>
         <source>Could not save, database does not point to a valid file.</source>
-        <translation>No se puede guardar, la BB.DD. no apunta a un fichero válido.</translation>
+        <translation>No se puede guardar, la base de datos no apunta a un archivo válido.</translation>
     </message>
     <message>
         <source>Could not save, database file is read-only.</source>
-        <translation>No se puede guardar, el fichero de BB.DD. es de solo lectura.</translation>
+        <translation>No se puede guardar, el archivo de base de datos es de solo lectura.</translation>
     </message>
     <message>
         <source>Database file has unmerged changes.</source>
-        <translation>La BB.DD. tiene cambios no combinados.</translation>
+        <translation>La base de datos tiene cambios no combinados.</translation>
     </message>
     <message>
         <source>Recycle Bin</source>
@@ -1083,14 +1083,14 @@ Copiar de seguridad de BB.DD. ubicada en %2</translation>
     <name>DatabaseOpenDialog</name>
     <message>
         <source>Unlock Database - KeePassXC</source>
-        <translation>Desbloquear BB.DD. - KeePassXC</translation>
+        <translation>Desbloquear base de datos - KeePassXC</translation>
     </message>
 </context>
 <context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Key File:</source>
-        <translation>Fichero llave:</translation>
+        <translation>Archivo clave:</translation>
     </message>
     <message>
         <source>Refresh</source>
@@ -1098,17 +1098,17 @@ Copiar de seguridad de BB.DD. ubicada en %2</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Formato de fichero llave heredado</translation>
+        <translation>Formato de archivo clave heredado</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation>Está utilizando un formato de fichero llave heredado que puede convertirse
+        <translation>Está utilizando un formato de archivo clave heredado que puede convertirse
 en no soportado en el futuro.
 
-Considere generar un nuevo fichero llave.</translation>
+Considere generar un nuevo archivo llave.</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
@@ -1116,19 +1116,19 @@ Considere generar un nuevo fichero llave.</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos los ficheros</translation>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
         <source>Key files</source>
-        <translation>Ficheros llave</translation>
+        <translation>Archivos clave</translation>
     </message>
     <message>
         <source>Select key file</source>
-        <translation>Seleccionar fichero llave</translation>
+        <translation>Seleccionar archivo clave</translation>
     </message>
     <message>
         <source>Failed to open key file: %1</source>
-        <translation>Fallo al abrir fichero de clave: %1</translation>
+        <translation>Fallo al abrir archivo clave: %1</translation>
     </message>
     <message>
         <source>Select slot...</source>
@@ -1136,7 +1136,7 @@ Considere generar un nuevo fichero llave.</translation>
     </message>
     <message>
         <source>Unlock KeePassXC Database</source>
-        <translation>Desbloquear BB.DD. KeePassXC</translation>
+        <translation>Desbloquear base de datos KeePassXC</translation>
     </message>
     <message>
         <source>Enter Password:</source>
@@ -1152,7 +1152,7 @@ Considere generar un nuevo fichero llave.</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation>Selección de fichero de llave </translation>
+        <translation>Selección de archivo clave </translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
@@ -1160,7 +1160,7 @@ Considere generar un nuevo fichero llave.</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Explorar para un fichero de claves</translation>
+        <translation>Explorar para un archivo clave</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1188,7 +1188,7 @@ Considere generar un nuevo fichero llave.</translation>
     </message>
     <message>
         <source>Clear Key File</source>
-        <translation>Vaciar fichero de clave</translation>
+        <translation>Limpiar archivo clave</translation>
     </message>
     <message>
         <source>Unlock failed and no password given</source>
@@ -1199,10 +1199,10 @@ Considere generar un nuevo fichero llave.</translation>
 Do you want to retry with an &quot;empty&quot; password instead?
 
 To prevent this error from appearing, you must go to &quot;Database Settings / Security&quot; and reset your password.</source>
-        <translation>Desbloquear la BB.DD. ha fallado y no introdujo una contraseña.
+        <translation>Desbloquear la base de datos ha fallado y no introdujo una contraseña.
 ¿Desea reintentar con una contraseña vacía?
 
-Para prevenir que aparezca este error, debe ir a «Configuración de BB.DD. / Seguridad» y reiniciar su contraseña.</translation>
+Para prevenir que aparezca este error, debe ir a «Configuración de base de datos / Seguridad» y reiniciar su contraseña.</translation>
     </message>
     <message>
         <source>Retry with empty password</source>
@@ -1210,7 +1210,7 @@ Para prevenir que aparezca este error, debe ir a «Configuración de BB.DD. / Se
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
-        <translation>Introducir credenciales adicionales (si alguna):</translation>
+        <translation>Introducir credenciales adicionales (si hay alguna):</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
@@ -1220,11 +1220,11 @@ Para prevenir que aparezca este error, debe ir a «Configuración de BB.DD. / Se
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Adicionalmente a su contraseña maestra, puede usar un archivo secreto para mejorar la seguridad de su base de datos. Dicho archivo puede ser generado en la configuración de seguridad de su base de datos.&lt;/p&gt;&lt;p&gt;Este no es su archivo de base de datos *.kdbx. &lt;br&gt;Si no tiene un fichero de claves, deje el campo vacío.&lt;/p&gt;&lt;p&gt;Clic para más información...&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Adicionalmente a su contraseña maestra, puede usar un archivo secreto para mejorar la seguridad de su base de datos. Dicho archivo puede ser generado en la configuración de seguridad de su base de datos.&lt;/p&gt;&lt;p&gt;Este no es su archivo de base de datos *.kdbx. &lt;br&gt;Si no tiene un archivo clave, deje el campo vacío.&lt;/p&gt;&lt;p&gt;Clic para más información...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Key file help</source>
-        <translation>Ayuda de fichero de claves</translation>
+        <translation>Ayuda de archivo clave</translation>
     </message>
     <message>
         <source>?</source>
@@ -1232,17 +1232,17 @@ Para prevenir que aparezca este error, debe ir a «Configuración de BB.DD. / Se
     </message>
     <message>
         <source>Select key file...</source>
-        <translation>Seleccionar fichero de claves...</translation>
+        <translation>Seleccionar archivo clave...</translation>
     </message>
     <message>
         <source>Cannot use database file as key file</source>
-        <translation>No se puede usar una base de datos como fichero de claves</translation>
+        <translation>No se puede usar una base de datos como archivo clave</translation>
     </message>
     <message>
         <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
-        <translation>No puede usar una base de datos como fichero de claves.
-Si no tiene un fichero de claves, deje el campo vacío.</translation>
+        <translation>No puede usar una base de datos como archivo clave.
+Si no tiene un archivo clave, deje el campo vacío.</translation>
     </message>
 </context>
 <context>
@@ -1291,7 +1291,7 @@ Si no tiene un fichero de claves, deje el campo vacío.</translation>
     </message>
     <message>
         <source>Forg&amp;et all site-specific settings on entries</source>
-        <translation>Olvid&amp;ar todas las configuraciones específicas del sitio en las apuntes</translation>
+        <translation>Olvid&amp;ar todas las configuraciones específicas del sitio en las entradas</translation>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
@@ -1303,17 +1303,17 @@ Si no tiene un fichero de claves, deje el campo vacío.</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Borrar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Delete the selected key?</source>
-        <translation>¿Borrar la clave seleccionada?</translation>
+        <translation>¿Eliminar la clave seleccionada?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected key?
 This may prevent connection to the browser plugin.</source>
-        <translation>¿Realmente quieres borrar la clave seleccionada?
-Esto puede imsolicitar la conexión con el complemento del explorador.</translation>
+        <translation>¿Desea eliminar la clave seleccionada?
+Esto puede impedir la conexión con el complemento del explorador.</translation>
     </message>
     <message>
         <source>Key</source>
@@ -1329,13 +1329,13 @@ Esto puede imsolicitar la conexión con el complemento del explorador.</translat
     </message>
     <message>
         <source>Disconnect all browsers</source>
-        <translation>Desconectar todos los exploradores</translation>
+        <translation>Desconectar todos los navegadores</translation>
     </message>
     <message>
         <source>Do you really want to disconnect all browsers?
 This may prevent connection to the browser plugin.</source>
         <translation>¿Desea desconectar todos los exploradores?
-Esto puede imsolicitar la conexión con el complemento del explorador.</translation>
+Esto puede impedir la conexión con el complemento del explorador.</translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
@@ -1347,7 +1347,7 @@ Esto puede imsolicitar la conexión con el complemento del explorador.</translat
     </message>
     <message>
         <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: las claves se eliminaron de la BB.DD.</translation>
+        <translation>KeePassXC: las claves se eliminaron de la base de datos</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
@@ -1355,13 +1355,13 @@ Esto puede imsolicitar la conexión con el complemento del explorador.</translat
     </message>
     <message>
         <source>Forget all site-specific settings on entries</source>
-        <translation>Olvidar todas las configuraciones específicas del sitio en las apuntes</translation>
+        <translation>Olvidar todas las configuraciones específicas del sitio en las entradas</translation>
     </message>
     <message>
         <source>Do you really want forget all site-specific settings on every entry?
 Permissions to access entries will be revoked.</source>
-        <translation>¿Desea olvidar todas las configuraciones específicas del sitio en cada apunte?
-Los permisos para acceder a las apuntes serán revocados.</translation>
+        <translation>¿Desea olvidar todas las configuraciones específicas del sitio en cada entrada?
+Los permisos para acceder a las entradas serán revocados.</translation>
     </message>
     <message>
         <source>Removing stored permissions…</source>
@@ -1377,15 +1377,15 @@ Los permisos para acceder a las apuntes serán revocados.</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Eliminados con éxito permisos de %n apunte.</numerusform><numerusform>Eliminados con éxito permisos de %n apuntes.</numerusform></translation>
+        <translation><numerusform>Eliminados con éxito permisos de %n entrada.</numerusform><numerusform>Eliminados con éxito permisos de %n entradas.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: ¡no se encontró ningun apunte con permisos!</translation>
+        <translation>KeePassXC: ¡no se encontró ninguna entrada con permisos!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with permissions.</source>
-        <translation>La BB.DD. activa no contiene un apunte con permisos.</translation>
+        <translation>La base de datos activa no contiene una entrada con permisos.</translation>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to custom data</source>
@@ -1394,7 +1394,7 @@ Los permisos para acceder a las apuntes serán revocados.</translation>
     <message>
         <source>Do you really want to move all legacy browser integration data to the latest standard?
 This is necessary to maintain compatibility with the browser plugin.</source>
-        <translation>¿Realmente desea mover todos los datos de integración del explorador heredado al último estándar?
+        <translation>¿Desea mover todos los datos de integración del explorador heredado al último estándar?
 Esto es necesario para mantener la compatibilidad con el complemento del explorador.</translation>
     </message>
     <message>
@@ -1403,7 +1403,7 @@ Esto es necesario para mantener la compatibilidad con el complemento del explora
     </message>
     <message>
         <source>Remove selected key</source>
-        <translation>Retirar clave seleccionada</translation>
+        <translation>Eliminar clave seleccionada</translation>
     </message>
 </context>
 <context>
@@ -1462,15 +1462,15 @@ Esto es necesario para mantener la compatibilidad con el complemento del explora
     </message>
     <message>
         <source>Higher values offer more protection, but opening the database will take longer.</source>
-        <translation>Los valores más altos ofrecen más protección, pero la apertura de la BB.DD. llevará más tiempo.</translation>
+        <translation>Los valores más altos ofrecen más protección, pero la apertura de la base de datos llevará más tiempo.</translation>
     </message>
     <message>
         <source>Database format:</source>
-        <translation>Formato de BB.DD.:</translation>
+        <translation>Formato de base de datos:</translation>
     </message>
     <message>
         <source>This is only important if you need to use your database with other programs.</source>
-        <translation>Esto solo es importante si necesita usar su BB.DD. con otros programas.</translation>
+        <translation>Esto solo es importante si necesita usar su base de datos con otros programas.</translation>
     </message>
     <message>
         <source>KDBX 4.0 (recommended)</source>
@@ -1496,7 +1496,7 @@ Esto es necesario para mantener la compatibilidad con el complemento del explora
 If you keep this number, your database may take hours or days (or even longer) to open!</source>
         <translation>Está utilizando una gran cantidad de rondas de transformación de clave con Argon2.
 
-Si conserva este número, ¡su BB.DD. puede tardar horas o días (o incluso más) en abrirse!</translation>
+Si conserva este número, ¡su base de datos puede tardar horas o días (o incluso más) en abrirse!</translation>
     </message>
     <message>
         <source>Understood, keep number</source>
@@ -1517,7 +1517,7 @@ Si conserva este número, ¡su BB.DD. puede tardar horas o días (o incluso más
 If you keep this number, your database may be too easy to crack!</source>
         <translation>Está utilizando una cantidad muy baja de rondas de transformación de llave con AES-KDF.
 
-Si conserva este número, ¡su BB.DD. puede ser muy fácil de descifrar!</translation>
+Si conserva este número, ¡su base de datos puede ser muy fácil de descifrar!</translation>
     </message>
     <message>
         <source>KDF unchanged</source>
@@ -1557,7 +1557,7 @@ Si conserva este número, ¡su BB.DD. puede ser muy fácil de descifrar!</transl
     </message>
     <message>
         <source>Database format</source>
-        <translation>Formato de BB.DD.</translation>
+        <translation>Formato de base de datos</translation>
     </message>
     <message>
         <source>Encryption algorithm</source>
@@ -1584,15 +1584,15 @@ Si conserva este número, ¡su BB.DD. puede ser muy fácil de descifrar!</transl
     <name>DatabaseSettingsWidgetFdoSecrets</name>
     <message>
         <source>Exposed Entries</source>
-        <translation>Exponer apuntes</translation>
+        <translation>Exponer entradas</translation>
     </message>
     <message>
         <source>Don&apos;t e&amp;xpose this database</source>
-        <translation>No e&amp;xponer esta BB.DD.</translation>
+        <translation>No e&amp;xponer esta base de datos</translation>
     </message>
     <message>
         <source>Expose entries &amp;under this group:</source>
-        <translation>Exponer apuntes &amp;bajo este grupo:</translation>
+        <translation>Exponer entradas &amp;bajo este grupo:</translation>
     </message>
     <message>
         <source>Enable fd.o Secret Service to access these settings.</source>
@@ -1603,19 +1603,19 @@ Si conserva este número, ¡su BB.DD. puede ser muy fácil de descifrar!</transl
     <name>DatabaseSettingsWidgetGeneral</name>
     <message>
         <source>Database Meta Data</source>
-        <translation>Metadatos de la BB.DD.</translation>
+        <translation>Metadatos de la base de datos</translation>
     </message>
     <message>
         <source>Database name:</source>
-        <translation>Nombre de la BB.DD.:</translation>
+        <translation>Nombre de la base de datos:</translation>
     </message>
     <message>
         <source>Database description:</source>
-        <translation>Descripción de la BB.DD.:</translation>
+        <translation>Descripción de la base de datos:</translation>
     </message>
     <message>
         <source>Default username:</source>
-        <translation>ID Usuario por defecto:</translation>
+        <translation>Usuario por defecto:</translation>
     </message>
     <message>
         <source>History Settings</source>
@@ -1639,7 +1639,7 @@ Si conserva este número, ¡su BB.DD. puede ser muy fácil de descifrar!</transl
     </message>
     <message>
         <source>Additional Database Settings</source>
-        <translation>Configuraciones adicionales de la BB.DD.</translation>
+        <translation>Configuraciones adicionales de la base de datos</translation>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
@@ -1647,11 +1647,11 @@ Si conserva este número, ¡su BB.DD. puede ser muy fácil de descifrar!</transl
     </message>
     <message>
         <source>Database name field</source>
-        <translation>Campo nombre de BB.DD.</translation>
+        <translation>Campo nombre de base de datos</translation>
     </message>
     <message>
         <source>Database description field</source>
-        <translation>Campo descripción de BB.DD.</translation>
+        <translation>Campo descripción de base de datos</translation>
     </message>
     <message>
         <source>Default username field</source>
@@ -1659,15 +1659,15 @@ Si conserva este número, ¡su BB.DD. puede ser muy fácil de descifrar!</transl
     </message>
     <message>
         <source>Maximum number of history items per entry</source>
-        <translation>Número máximo de elementos de historial por apunte</translation>
+        <translation>Número máximo de elementos de historial por entrada</translation>
     </message>
     <message>
         <source>Maximum size of history per entry</source>
-        <translation>Tamaño máximo de historial por apunte</translation>
+        <translation>Tamaño máximo de historial por entrada</translation>
     </message>
     <message>
         <source>Delete Recycle Bin</source>
-        <translation>Borrar papelera de reciclaje</translation>
+        <translation>Eliminar papelera de reciclaje</translation>
     </message>
     <message>
         <source>Do you want to delete the current recycle bin and all its contents?
@@ -1716,7 +1716,7 @@ Esta acción no es reversible.</translation>
     <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
         <source>Add additional protection...</source>
-        <translation>Agregar protección adicional...</translation>
+        <translation>Añadir protección adicional...</translation>
     </message>
     <message>
         <source>No encryption key added</source>
@@ -1724,7 +1724,7 @@ Esta acción no es reversible.</translation>
     </message>
     <message>
         <source>You must add at least one encryption key to secure your database!</source>
-        <translation>¡Debe agregar al menos una clave de cifrado para proteger su BB.DD.!</translation>
+        <translation>¡Debe añadir al menos una clave de cifrado para proteger su base de datos!</translation>
     </message>
     <message>
         <source>No password set</source>
@@ -1734,7 +1734,7 @@ Esta acción no es reversible.</translation>
         <source>WARNING! You have not set a password. Using a database without a password is strongly discouraged!
 
 Are you sure you want to continue without a password?</source>
-        <translation>¡ADVERTENCIA! No ha establecido una contraseña. Se desaconseja el uso de una BB.DD. sin contraseña.
+        <translation>¡ADVERTENCIA! No ha establecido una contraseña. Se desaconseja el uso de una base de datos sin contraseña.
 
 ¿Desea continuar sin contraseña?</translation>
     </message>
@@ -1755,7 +1755,7 @@ Are you sure you want to continue without a password?</source>
     <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
         <source>Database Name:</source>
-        <translation>Nombre de la BB.DD.:</translation>
+        <translation>Nombre de la base de datos:</translation>
     </message>
     <message>
         <source>Description:</source>
@@ -1763,11 +1763,11 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Database name field</source>
-        <translation>Campo nombre de BB.DD.</translation>
+        <translation>Campo nombre de base de datos</translation>
     </message>
     <message>
         <source>Database description field</source>
-        <translation>Campo descripción de BB.DD.</translation>
+        <translation>Campo descripción de base de datos</translation>
     </message>
 </context>
 <context>
@@ -1790,7 +1790,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Database name</source>
-        <translation>Nombre de la BB.DD.</translation>
+        <translation>Nombre de la base de datos</translation>
     </message>
     <message>
         <source>Description</source>
@@ -1818,7 +1818,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>The database was modified, but the changes have not yet been saved to disk.</source>
-        <translation>La BB.DD. fue modificada pero los cambios no han sido guardados a disco todavía.</translation>
+        <translation>La base de datos fue modificada pero los cambios no han sido guardados a disco todavía.</translation>
     </message>
     <message>
         <source>Number of groups</source>
@@ -1826,15 +1826,15 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Number of entries</source>
-        <translation>Número de apuntes</translation>
+        <translation>Número de entradas</translation>
     </message>
     <message>
         <source>Number of expired entries</source>
-        <translation>Número de apuntes expirados</translation>
+        <translation>Número de entradas expiradas</translation>
     </message>
     <message>
         <source>The database contains entries that have expired.</source>
-        <translation>La BB.DD. contiene apuntes que han expirado.</translation>
+        <translation>La base de datos contiene entradas que han expirado.</translation>
     </message>
     <message>
         <source>Unique passwords</source>
@@ -1893,62 +1893,62 @@ Are you sure you want to continue without a password?</source>
     <name>DatabaseTabWidget</name>
     <message>
         <source>KeePass 2 Database</source>
-        <translation>BB.DD. de KeePass 2</translation>
+        <translation>Base de datos de KeePass 2</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos los ficheros</translation>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
         <source>Open database</source>
-        <translation>Abrir BB.DD.</translation>
+        <translation>Abrir base de datos</translation>
     </message>
     <message>
         <source>CSV file</source>
-        <translation>Fichero CSV</translation>
+        <translation>Archivo CSV</translation>
     </message>
     <message>
         <source>Merge database</source>
-        <translation>Combinar BB.DD.</translation>
+        <translation>Combinar base de datos</translation>
     </message>
     <message>
         <source>Open KeePass 1 database</source>
-        <translation>Abrir BB.DD. KeePass 1</translation>
+        <translation>Abrir base de datos KeePass 1</translation>
     </message>
     <message>
         <source>KeePass 1 database</source>
-        <translation>BB.DD. KeePass 1</translation>
+        <translation>Base de datos KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
-        <translation>Exportar BB.DD. a un fichero CSV</translation>
+        <translation>Exportar base de datos a un archivo CSV</translation>
     </message>
     <message>
         <source>Writing the CSV file failed.</source>
-        <translation>La escritura del fichero CSV falló.</translation>
+        <translation>La escritura del archivo CSV falló.</translation>
     </message>
     <message>
         <source>Database creation error</source>
-        <translation>Error en creación de la BB.DD.</translation>
+        <translation>Error en creación de la base de datos.</translation>
     </message>
     <message>
         <source>The created database has no key or KDF, refusing to save it.
 This is definitely a bug, please report it to the developers.</source>
-        <translation>La BB.DD. creada no tiene clave o KDF, negándose a guardarla.
+        <translation>La base de datos creada no tiene clave o KDF, negándose a guardarla.
 Esto es definitivamente un defecto, por favor infórmelo a los desarrolladores.</translation>
     </message>
     <message>
         <source>Select CSV file</source>
-        <translation>Seleccionar fichero CSV</translation>
+        <translation>Seleccionar archivo CSV</translation>
     </message>
     <message>
         <source>New Database</source>
-        <translation>Nueva BB.DD.</translation>
+        <translation>Nueva base de datos</translation>
     </message>
     <message>
         <source>%1 [New Database]</source>
         <comment>Database tab name modifier</comment>
-        <translation>%1 [Nueva BB.DD.]</translation>
+        <translation>%1 [Nueva base de datos]</translation>
     </message>
     <message>
         <source>%1 [Locked]</source>
@@ -1966,15 +1966,15 @@ Esto es definitivamente un defecto, por favor infórmelo a los desarrolladores.<
     </message>
     <message>
         <source>Export database to HTML file</source>
-        <translation>Exportar BB.DD. a fichero HTML</translation>
+        <translation>Exportar base de datos a archivo HTML</translation>
     </message>
     <message>
         <source>HTML file</source>
-        <translation>Fichero HTML</translation>
+        <translation>Archivo HTML</translation>
     </message>
     <message>
         <source>Writing the HTML file failed.</source>
-        <translation>Fallo escribiendo a fichero HTML.</translation>
+        <translation>Fallo escribiendo a archivo HTML.</translation>
     </message>
     <message>
         <source>Export Confirmation</source>
@@ -1982,7 +1982,7 @@ Esto es definitivamente un defecto, por favor infórmelo a los desarrolladores.<
     </message>
     <message>
         <source>You are about to export your database to an unencrypted file. This will leave your passwords and sensitive information vulnerable! Are you sure you want to continue?</source>
-        <translation>Está a punto de exportar su BB.DD. a un fichero sin cifrar. Esto dejará sus contraseñas e información sensible vulnerable. ¿Desea continuar?</translation>
+        <translation>Está a punto de exportar su base de datos a un archivo sin cifrar. Esto dejará sus contraseñas e información sensible vulnerable. ¿Desea continuar?</translation>
     </message>
 </context>
 <context>
@@ -1993,19 +1993,19 @@ Esto es definitivamente un defecto, por favor infórmelo a los desarrolladores.<
     </message>
     <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation>¿Realmente quiere eliminar el apunte «%1» de forma definitiva?</translation>
+        <translation>¿Desea eliminar la entrada «%1» de forma definitiva?</translation>
     </message>
     <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>¿Realmente quiere mover el apunte «%1» a la papelera de reciclaje?</translation>
+        <translation>¿Desea mover la entrada «%1» a la papelera de reciclaje?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>¿Desea mover %n apunte a la papelera de reciclaje?</numerusform><numerusform>¿Desea mover %n apuntes a la papelera de reciclaje?</numerusform></translation>
+        <translation><numerusform>¿Desea mover %n entrada a la papelera de reciclaje?</numerusform><numerusform>¿Desea mover %n entradas a la papelera de reciclaje?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
-        <translation>¿Ejecutar mandato?</translation>
+        <translation>¿Ejecutar comando?</translation>
     </message>
     <message>
         <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
@@ -2021,11 +2021,11 @@ Esto es definitivamente un defecto, por favor infórmelo a los desarrolladores.<
     </message>
     <message>
         <source>No current database.</source>
-        <translation>No hay una BB.DD. actualmente.</translation>
+        <translation>No hay una base de datos actualmente.</translation>
     </message>
     <message>
         <source>No source database, nothing to do.</source>
-        <translation>No hay una BB.DD. de origen, nada para hacer.</translation>
+        <translation>No hay una base de datos de origen, nada para hacer.</translation>
     </message>
     <message>
         <source>Search Results (%1)</source>
@@ -2037,11 +2037,11 @@ Esto es definitivamente un defecto, por favor infórmelo a los desarrolladores.<
     </message>
     <message>
         <source>File has changed</source>
-        <translation>El fichero ha cambiado</translation>
+        <translation>El archivo ha cambiado</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>El fichero de la BB.DD. ha cambiado. ¿Desea cargar los cambios?</translation>
+        <translation>El archivo de la base de datos ha cambiado. ¿Desea cargar los cambios?</translation>
     </message>
     <message>
         <source>Merge Request</source>
@@ -2050,7 +2050,7 @@ Esto es definitivamente un defecto, por favor infórmelo a los desarrolladores.<
     <message>
         <source>The database file has changed and you have unsaved changes.
 Do you want to merge your changes?</source>
-        <translation>El fichero de la BB.DD. ha cambiado y usted tiene modificaciones sin guardar. ¿Desea combinar sus modificaciones?</translation>
+        <translation>El archivo de la base de datos ha cambiado y usted tiene modificaciones sin guardar. ¿Desea combinar sus modificaciones?</translation>
     </message>
     <message>
         <source>Empty recycle bin?</source>
@@ -2062,23 +2062,23 @@ Do you want to merge your changes?</source>
     </message>
     <message numerus="yes">
         <source>Do you really want to delete %n entry(s) for good?</source>
-        <translation><numerusform>¿Desea eliminar %n apunte para siempre?</numerusform><numerusform>¿Desea eliminar %n apuntes para siempre?</numerusform></translation>
+        <translation><numerusform>¿Desea eliminar %n entrada para siempre?</numerusform><numerusform>¿Desea eliminar %n entradas para siempre?</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>Delete entry(s)?</source>
-        <translation><numerusform>¿Borrar apunte?</numerusform><numerusform>¿Borrar apuntes?</numerusform></translation>
+        <translation><numerusform>¿Eliminar entrada?</numerusform><numerusform>¿Eliminar entradas?</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>Move entry(s) to recycle bin?</source>
-        <translation><numerusform>¿Mover apunte a la papelera de reciclaje?</numerusform><numerusform>¿Mover apuntes a la papelera de reciclaje?</numerusform></translation>
+        <translation><numerusform>¿Mover entrada a la papelera de reciclaje?</numerusform><numerusform>¿Mover entradas a la papelera de reciclaje?</numerusform></translation>
     </message>
     <message>
         <source>Lock Database?</source>
-        <translation>¿Bloquear la BB.DD.?</translation>
+        <translation>¿Bloquear la base de datos?</translation>
     </message>
     <message>
         <source>You are editing an entry. Discard changes and lock anyway?</source>
-        <translation>Estás editando un apunte. ¿Descartar los cambios y bloquear de todos modos?</translation>
+        <translation>Estás editando una entrada. ¿Descartar los cambios y bloquear de todos modos?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; was modified.
@@ -2089,7 +2089,7 @@ Save changes?</source>
     <message>
         <source>Database was modified.
 Save changes?</source>
-        <translation>Se modificó la BB.DD.
+        <translation>Se modificó la base de datos.
 ¿Guardar cambios?</translation>
     </message>
     <message>
@@ -2099,7 +2099,7 @@ Save changes?</source>
     <message>
         <source>Could not open the new database file while attempting to autoreload.
 Error: %1</source>
-        <translation>No se pudo abrir el nuevo fichero de BB.DD. al intentar cargar automáticamente.
+        <translation>No se pudo abrir el nuevo archivo de base de datos al intentar cargar automáticamente.
 Error: %1</translation>
     </message>
     <message>
@@ -2109,7 +2109,7 @@ Error: %1</translation>
     <message>
         <source>KeePassXC has failed to save the database multiple times. This is likely caused by file sync services holding a lock on the save file.
 Disable safe saves and try again?</source>
-        <translation>KeePassXC no ha podido guardar la BB.DD. varias veces. Esto es probablemente causado por los servicios de sincronización de ficheros manteniendo un bloqueo en el fichero.
+        <translation>KeePassXC no ha podido guardar la base de datos varias veces. Esto es probablemente causado por los servicios de sincronización de archivos manteniendo un bloqueo en el archivo.
 ¿Desactivar el guardado seguro y volver a intentarlo?</translation>
     </message>
     <message>
@@ -2118,23 +2118,23 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Save database as</source>
-        <translation>Guardar BB.DD. como</translation>
+        <translation>Guardar base de datos como</translation>
     </message>
     <message>
         <source>KeePass 2 Database</source>
-        <translation>BB.DD. de KeePass 2</translation>
+        <translation>Base de datos de KeePass 2</translation>
     </message>
     <message>
         <source>Replace references to entry?</source>
-        <translation>¿Reemplazar las referencias a el apunte?</translation>
+        <translation>¿Reemplazar las referencias a la entrada?</translation>
     </message>
     <message numerus="yes">
         <source>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</source>
-        <translation><numerusform>El apunte &quot;%1&quot; tiene %2 referencia. ¿Desea sobrescribir la referencia con el valor, saltarse esta apunte o borrarla de todos modos?</numerusform><numerusform>El apunte «%1» tiene %2 referencias. ¿Desea sobrescribir las referencias con los valores, omitir esta apunte o eliminarla de todos modos?</numerusform></translation>
+        <translation><numerusform>La entrada «%1» tiene %2 referencia. ¿Desea sobrescribir la referencia con el valor, omitir esta entrada o eliminarla de todos modos?</numerusform><numerusform>La entrada «%1» tiene %2 referencias. ¿Desea sobrescribir las referencias con los valores, omitir esta entrada o eliminarla de todos modos?</numerusform></translation>
     </message>
     <message>
         <source>Delete group</source>
-        <translation>Borrar grupo</translation>
+        <translation>Eliminar grupo</translation>
     </message>
     <message>
         <source>Move group to recycle bin?</source>
@@ -2146,11 +2146,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Successfully merged the database files.</source>
-        <translation>Combinados correctamente los ficheros de BB.DD.</translation>
+        <translation>Combinados correctamente los archivos de base de datos</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
-        <translation>La BB.DD. no fue modificada por la operación de combinar.</translation>
+        <translation>La base de datos no fue modificada por la operación de combinar.</translation>
     </message>
     <message>
         <source>Shared group...</source>
@@ -2158,11 +2158,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Writing the database failed: %1</source>
-        <translation>Fallo al escribir la BB.DD.: %1</translation>
+        <translation>Fallo al escribir la base de datos: %1</translation>
     </message>
     <message>
         <source>This database is opened in read-only mode. Autosave is disabled.</source>
-        <translation>Esta BB.DD. está abierta en modo solo lectura. El autoguardado está deshabilitado.</translation>
+        <translation>Esta base de datos está abierta en modo solo lectura. El autoguardado está deshabilitado.</translation>
     </message>
 </context>
 <context>
@@ -2209,7 +2209,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>File too large to be a private key</source>
-        <translation>Fichero demasiado grande para ser una llave privada</translation>
+        <translation>Archivo demasiado grande para ser una llave privada</translation>
     </message>
     <message>
         <source>Failed to open private key</source>
@@ -2217,15 +2217,15 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Entry history</source>
-        <translation>Historial de apuntes</translation>
+        <translation>Historial de entradas</translation>
     </message>
     <message>
         <source>Add entry</source>
-        <translation>Agregar apunte</translation>
+        <translation>Añadir entrada</translation>
     </message>
     <message>
         <source>Edit entry</source>
-        <translation>Editar apunte</translation>
+        <translation>Editar entrada</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
@@ -2257,7 +2257,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation>¿Desea aplicar la contraseña generada en esta apunte?</translation>
+        <translation>¿Desea aplicar la contraseña generada en esta entrada?</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
@@ -2265,7 +2265,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Entry has unsaved changes</source>
-        <translation>El apunte tiene cambios sin guardar</translation>
+        <translation>La entrada tiene cambios sin guardar</translation>
     </message>
     <message>
         <source>New attribute %1</source>
@@ -2304,11 +2304,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add</source>
-        <translation>Agregar</translation>
+        <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Retirar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Edit Name</source>
@@ -2344,11 +2344,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add a new attribute</source>
-        <translation>Agregar nuevo atributo</translation>
+        <translation>Añadir nuevo atributo</translation>
     </message>
     <message>
         <source>Remove selected attribute</source>
-        <translation>Retirar atributo seleccionado</translation>
+        <translation>Eliminar atributo seleccionado</translation>
     </message>
     <message>
         <source>Edit attribute name</source>
@@ -2375,7 +2375,7 @@ Disable safe saves and try again?</source>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation>Activar autoescritura para esta apunte</translation>
+        <translation>Activar autoescritura para esta entrada</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
@@ -2419,11 +2419,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add new window association</source>
-        <translation>Agregar nueva asociación de ventana</translation>
+        <translation>Añadir nueva asociación de ventana</translation>
     </message>
     <message>
         <source>Remove selected window association</source>
-        <translation>Retirar asociación de ventana</translation>
+        <translation>Eliminar asociación de ventana</translation>
     </message>
     <message>
         <source>You can use an asterisk (*) to match everything</source>
@@ -2446,7 +2446,7 @@ Disable safe saves and try again?</source>
     <name>EditEntryWidgetBrowser</name>
     <message>
         <source>These settings affect to the entry&apos;s behaviour with the browser extension.</source>
-        <translation>Esta configuración afecta al comportamiento de esta apunte con la extensión del explorador.</translation>
+        <translation>Esta configuración afecta al comportamiento de esta entrada con la extensión del explorador.</translation>
     </message>
     <message>
         <source>General</source>
@@ -2454,11 +2454,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Skip Auto-Submit for this entry</source>
-        <translation>Descartar autoenvío para esta apunte</translation>
+        <translation>Descartar autoenvío para esta entrada</translation>
     </message>
     <message>
         <source>Hide this entry from the browser extension</source>
-        <translation>Ocultar esta apunte de la extensión del explorador</translation>
+        <translation>Ocultar esta entrada de la extensión del explorador</translation>
     </message>
     <message>
         <source>Additional URL&apos;s</source>
@@ -2466,11 +2466,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add</source>
-        <translation>Agregar</translation>
+        <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Retirar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -2489,31 +2489,31 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Borrar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Delete all</source>
-        <translation>Borrar todo</translation>
+        <translation>Eliminar todo</translation>
     </message>
     <message>
         <source>Entry history selection</source>
-        <translation>Selección de apunte de historial</translation>
+        <translation>Selección de entrada de historial</translation>
     </message>
     <message>
         <source>Show entry at selected history state</source>
-        <translation>Mostrar apunte en historial seleccionado</translation>
+        <translation>Mostrar entrada en historial seleccionado</translation>
     </message>
     <message>
         <source>Restore entry to selected history state</source>
-        <translation>Restaurar apunte al estado historial seleccionado</translation>
+        <translation>Restaurar entrada al estado historial seleccionado</translation>
     </message>
     <message>
         <source>Delete selected history state</source>
-        <translation>Borrar el historial seleccionado</translation>
+        <translation>Eliminar el historial seleccionado</translation>
     </message>
     <message>
         <source>Delete all history</source>
-        <translation>Borrar todo el historial</translation>
+        <translation>Eliminar todo el historial</translation>
     </message>
 </context>
 <context>
@@ -2548,7 +2548,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Username:</source>
-        <translation>ID Usuario:</translation>
+        <translation>Usuario:</translation>
     </message>
     <message>
         <source>Expires</source>
@@ -2568,7 +2568,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation>Intercambiar generador de contraseña</translation>
+        <translation>Intercambiar generador de contraseñas</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -2631,7 +2631,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
-        <translation>Retirar llave del agente cuando la BB.DD. está cerrada/bloqueada</translation>
+        <translation>Eliminar llave del agente cuando la base de datos está cerrada/bloqueada</translation>
     </message>
     <message>
         <source>Public key</source>
@@ -2639,7 +2639,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add key to agent when database is opened/unlocked</source>
-        <translation>Agregar llave al agente cuando la BB.DD. se abre/desbloquea</translation>
+        <translation>Añadir llave al agente cuando la base de datos se abre/desbloquea</translation>
     </message>
     <message>
         <source>Comment</source>
@@ -2663,7 +2663,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>External file</source>
-        <translation>Fichero externo</translation>
+        <translation>Archivo externo</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -2676,11 +2676,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add to agent</source>
-        <translation>Agregar a agente</translation>
+        <translation>Añadir a agente</translation>
     </message>
     <message>
         <source>Remove from agent</source>
-        <translation>Retirar del agente</translation>
+        <translation>Eliminar del agente</translation>
     </message>
     <message>
         <source>Require user confirmation when this key is used</source>
@@ -2688,19 +2688,19 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
-        <translation>Retirar clave del agente tras los segundos especificados</translation>
+        <translation>Eliminar clave del agente tras los segundos especificados</translation>
     </message>
     <message>
         <source>Browser for key file</source>
-        <translation>Explorar para fichero de claves</translation>
+        <translation>Explorar para archivo clave</translation>
     </message>
     <message>
         <source>External key file</source>
-        <translation>Fichero de claves externa</translation>
+        <translation>Archivo clave externa</translation>
     </message>
     <message>
         <source>Select attachment file</source>
-        <translation>Seleccionar fichero adjunto</translation>
+        <translation>Seleccionar archivo adjunto</translation>
     </message>
 </context>
 <context>
@@ -2719,7 +2719,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add group</source>
-        <translation>Agregar grupo</translation>
+        <translation>Añadir grupo</translation>
     </message>
     <message>
         <source>Edit group</source>
@@ -2739,7 +2739,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Entry has unsaved changes</source>
-        <translation>El apunte tiene cambios sin guardar</translation>
+        <translation>La entrada tiene cambios sin guardar</translation>
     </message>
 </context>
 <context>
@@ -2786,7 +2786,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Select import/export file</source>
-        <translation>Seleccione el fichero de importación/exportación</translation>
+        <translation>Seleccione el archivo de importación/exportación</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -2812,15 +2812,15 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
-        <translation>%1 ya está siendo exportada por esta BB.DD.</translation>
+        <translation>%1 ya está siendo exportada por esta base de datos.</translation>
     </message>
     <message>
         <source>%1 is already being imported by this database.</source>
-        <translation>%1 ya está siendo exportada por esta BB.DD.</translation>
+        <translation>%1 ya está siendo importada por esta base de datos.</translation>
     </message>
     <message>
         <source>%1 is being imported and exported by different groups in this database.</source>
-        <translation>%1 ya está siendo importada y exportada por diferentes grupos en esta BB.DD.</translation>
+        <translation>%1 ya está siendo importada y exportada por diferentes grupos en esta base de datos.</translation>
     </message>
     <message>
         <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
@@ -2829,11 +2829,11 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>Database export is currently disabled by application settings.</source>
-        <translation>La exportación de la BB.DD. actualmente está deshabilitada en la configuración de aplicación.</translation>
+        <translation>La exportación de la base de datos actualmente está deshabilitada en la configuración de aplicación.</translation>
     </message>
     <message>
         <source>Database import is currently disabled by application settings.</source>
-        <translation>La importación de BB.DD. actualmente está deshabilitada por la configuración de aplicación</translation>
+        <translation>La importación de base de datos actualmente está deshabilitada por la configuración de aplicación</translation>
     </message>
     <message>
         <source>Sharing mode field</source>
@@ -2841,11 +2841,11 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>Path to share file field</source>
-        <translation>Ruta para campo de fichero compartir</translation>
+        <translation>Ruta para campo de archivo compartir</translation>
     </message>
     <message>
         <source>Browser for share file</source>
-        <translation>Explorar para un fichero compartir</translation>
+        <translation>Explorar para un archivo compartir</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -2935,11 +2935,11 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>Add custom icon</source>
-        <translation>Agregar icono personalizado</translation>
+        <translation>Añadir icono personalizado</translation>
     </message>
     <message>
         <source>Delete custom icon</source>
-        <translation>Borrar icono personalizado</translation>
+        <translation>Eliminar icono personalizado</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -2955,7 +2955,7 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos los ficheros</translation>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -2967,7 +2967,7 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message numerus="yes">
         <source>Successfully loaded %1 of %n icon(s)</source>
-        <translation><numerusform>Cargado(s) %1 de %n ícono correctamente</numerusform><numerusform>Cargado(s) %1 de %n iconos correctamente</numerusform></translation>
+        <translation><numerusform>Cargado %1 de %n icono correctamente</numerusform><numerusform>Cargados %1 de %n iconos correctamente</numerusform></translation>
     </message>
     <message>
         <source>No icons were loaded</source>
@@ -2975,7 +2975,7 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message numerus="yes">
         <source>%n icon(s) already exist in the database</source>
-        <translation><numerusform>%n ícono ya existe en la BB.DD.</numerusform><numerusform>%n íconos ya existen en la BB.DD.</numerusform></translation>
+        <translation><numerusform>%n icono ya existe en la base de datos</numerusform><numerusform>%n iconos ya existen en la base de datos</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>The following icon(s) failed:</source>
@@ -2983,7 +2983,7 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message numerus="yes">
         <source>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation><numerusform>Este icono se utiliza en %n apunte, y será remplazado por el icono por defecto. ¿Desea eliminarlo?</numerusform><numerusform>Este icono se utiliza en %n apuntes, y será remplazado por el icono por defecto. ¿Desea eliminarlo?</numerusform></translation>
+        <translation><numerusform>Este icono se utiliza en %n entrada, y será remplazado por el icono por defecto. ¿Desea eliminarlo?</numerusform><numerusform>Este icono se utiliza en %n entradas, y será remplazado por el icono por defecto. ¿Desea eliminarlo?</numerusform></translation>
     </message>
     <message>
         <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
@@ -2995,7 +2995,7 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>Apply selected icon to subgroups and entries</source>
-        <translation>Aplicar icono seleccionado a subgrupos y apuntes</translation>
+        <translation>Aplicar icono seleccionado a subgrupos y entradas</translation>
     </message>
     <message>
         <source>Apply icon &amp;to ...</source>
@@ -3011,7 +3011,7 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>Also apply to child entries</source>
-        <translation>Aplicar también a los subapuntes</translation>
+        <translation>Aplicar también a las subentradas</translation>
     </message>
     <message>
         <source>Also apply to all children</source>
@@ -3046,16 +3046,16 @@ Las extensiones soportadas son: %1.</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Quitar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Delete plugin data?</source>
-        <translation>¿Borrar los datos del complemento?</translation>
+        <translation>¿Eliminar los datos del complemento?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected plugin data?
 This may cause the affected plugins to malfunction.</source>
-        <translation>¿Realmente desea eliminar los datos del complemento seleccionado?
+        <translation>¿Desea eliminar los datos del complemento seleccionado?
 Esto puede causar un mal funcionamiento de los complementos afectados.</translation>
     </message>
     <message>
@@ -3088,7 +3088,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Remove selected plugin data</source>
-        <translation>Quitar complemento de datos seleccionado</translation>
+        <translation>Eliminar complemento de datos seleccionado</translation>
     </message>
 </context>
 <context>
@@ -3117,11 +3117,11 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Add</source>
-        <translation>Agregar</translation>
+        <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Retirar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Open</source>
@@ -3133,7 +3133,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Select files</source>
-        <translation>Seleccionar ficheros</translation>
+        <translation>Seleccionar archivos</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
@@ -3151,7 +3151,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
-        <translation>¿Desea sobrescribir el fichero existente «%1» con el fichero adjunto?</translation>
+        <translation>¿Desea sobrescribir el archivo existente «%1» con el archivo adjunto?</translation>
     </message>
     <message>
         <source>Confirm overwrite</source>
@@ -3183,7 +3183,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
         <source>Unable to open file(s):
 %1</source>
         <translation><numerusform>Incapaz de abrir el fichero:
-%1</numerusform><numerusform>Incapaz de abrir los ficheros:
+%1</numerusform><numerusform>Incapaz de abrir los archivos:
 %1</numerusform></translation>
     </message>
     <message>
@@ -3192,7 +3192,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Add new attachment</source>
-        <translation>Agregar nuevo adjunto</translation>
+        <translation>Añadir nuevo adjunto</translation>
     </message>
     <message>
         <source>Remove selected attachment</source>
@@ -3226,7 +3226,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Username</source>
-        <translation>ID Usuario</translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <source>URL</source>
@@ -3250,7 +3250,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Username</source>
-        <translation>ID Usuario</translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <source>URL</source>
@@ -3290,7 +3290,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Yes</source>
-        <translation>Si</translation>
+        <translation>Sí</translation>
     </message>
     <message>
         <source>TOTP</source>
@@ -3309,7 +3309,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Username</source>
-        <translation>ID Usuario</translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
@@ -3337,7 +3337,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Autotype</source>
-        <translation>Autoescritura</translation>
+        <translation>Autotecleo</translation>
     </message>
     <message>
         <source>Window</source>
@@ -3401,7 +3401,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message>
         <source>Hide Usernames</source>
-        <translation>Ocultar nombres de usuario</translation>
+        <translation>Ocultar usuario</translation>
     </message>
     <message>
         <source>Hide Passwords</source>
@@ -3428,7 +3428,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     <name>FdoSecrets::Item</name>
     <message>
         <source>Entry &quot;%1&quot; from database &quot;%2&quot; was used by %3</source>
-        <translation>Entrada «%1» de la BB.DD. «%2» fue usada por %3</translation>
+        <translation>Entrada «%1» de la base de datos «%2» fue usada por %3</translation>
     </message>
 </context>
 <context>
@@ -3440,7 +3440,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
-        <translation><numerusform>%n apunte fue usada por %1</numerusform><numerusform>%n apuntes fueron usadas por %1</numerusform></translation>
+        <translation><numerusform>%n entrada fue usada por %1</numerusform><numerusform>%n apunte(s) fueron usado(s) por %1</numerusform></translation>
     </message>
 </context>
 <context>
@@ -3462,11 +3462,11 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     <name>HostInstaller</name>
     <message>
         <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC: ¡no se puede guardar el fichero!</translation>
+        <translation>KeePassXC: ¡no se puede guardar el archivo!</translation>
     </message>
     <message>
         <source>Cannot save the native messaging script file.</source>
-        <translation>No se puede guardar el fichero de script de mensajería nativo.</translation>
+        <translation>No se puede guardar el archivo de script de mensajería nativo.</translation>
     </message>
 </context>
 <context>
@@ -3499,7 +3499,7 @@ Puede habilitar el servicio de iconos del sitio web DuckDuckGo en la sección se
     </message>
     <message>
         <source>Please wait, processing entry list...</source>
-        <translation>Espere, procesando listado de apuntes...</translation>
+        <translation>Espere, procesando listado del apunte…</translation>
     </message>
     <message>
         <source>Downloading...</source>
@@ -3545,7 +3545,7 @@ Puede habilitar el servicio de iconos del sitio web DuckDuckGo en la sección se
     </message>
     <message>
         <source>missing database headers</source>
-        <translation>faltan las cabeceras de la BB.DD.</translation>
+        <translation>faltan las cabeceras de la base de datos</translation>
     </message>
     <message>
         <source>Header doesn&apos;t match hash</source>
@@ -3567,7 +3567,7 @@ Puede habilitar el servicio de iconos del sitio web DuckDuckGo en la sección se
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
         <translation>Se han proporcionado credenciales inválidas, inténtelo de nuevo.
-Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</translation>
+Si ocurre nuevamente entonces su archivo de base de datos puede estar corrupto.</translation>
     </message>
 </context>
 <context>
@@ -3585,7 +3585,7 @@ Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</transl
     <name>Kdbx4Reader</name>
     <message>
         <source>missing database headers</source>
-        <translation>faltan las cabeceras de la BB.DD.</translation>
+        <translation>faltan las cabeceras de la base de datos</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
@@ -3625,7 +3625,7 @@ Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</transl
     </message>
     <message>
         <source>Legacy header fields found in KDBX4 file.</source>
-        <translation>Los campos heredados de la cabecera  se encuentran en el fichero KDBX4.</translation>
+        <translation>Los campos heredados de la cabecera  se encuentran en el archivo KDBX4.</translation>
     </message>
     <message>
         <source>Invalid inner header id size</source>
@@ -3647,63 +3647,63 @@ Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</transl
     <message>
         <source>Invalid variant map entry name length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Longitud del nombre del apunte del mapa de variante inválida</translation>
+        <translation>Longitud del nombre de la entrada del mapa de variante inválida</translation>
     </message>
     <message>
         <source>Invalid variant map entry name data</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Datos del nombre del apunte de mapa de variante inválida</translation>
+        <translation>Datos del nombre de la entrada de mapa de variante inválida</translation>
     </message>
     <message>
         <source>Invalid variant map entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Longitud del valor del apunte del mapa de variante inválida</translation>
+        <translation>Longitud del valor de la entrada del mapa de variante inválida</translation>
     </message>
     <message>
         <source>Invalid variant map entry value data</source>
         <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
-        <translation>Datos del valor del apunte de mapa de variante inválida</translation>
+        <translation>Datos del valor de la entrada de mapa de variante inválida</translation>
     </message>
     <message>
         <source>Invalid variant map Bool entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Longitud del valor del apunte del mapa booleano de variante inválida</translation>
+        <translation>Longitud del valor de la entrada del mapa booleano de variante inválida</translation>
     </message>
     <message>
         <source>Invalid variant map Int32 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Largo inválido en valor de apunte Int32 de mapeo de variante</translation>
+        <translation>Largo inválido en valor de la entrada Int32 de mapeo de variante</translation>
     </message>
     <message>
         <source>Invalid variant map UInt32 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Largo inválido en valor de apunte UInt32 de mapeo de variante</translation>
+        <translation>Largo inválido en valor de entrada UInt32 de mapeo de variante</translation>
     </message>
     <message>
         <source>Invalid variant map Int64 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Largo inválido en valor de apunte Int64 de mapeo de variante</translation>
+        <translation>Largo inválido en valor de entrada Int64 de mapeo de variante</translation>
     </message>
     <message>
         <source>Invalid variant map UInt64 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Largo inválido en valor de apunte UInt64 de mapeo de variante</translation>
+        <translation>Largo inválido en valor de entrada UInt64 de mapeo de variante</translation>
     </message>
     <message>
         <source>Invalid variant map entry type</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Tipo de apunte inválida de mapeo devariante</translation>
+        <translation>Tipo de entrada inválida de mapeo devariante</translation>
     </message>
     <message>
         <source>Invalid variant map field type size</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Mapei de variante inválido en campo de tipo tamaño</translation>
+        <translation>Mapa de variante inválido en campo de tipo tamaño</translation>
     </message>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
         <translation>Se han proporcionado credenciales inválidas, inténtelo de nuevo.
-Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</translation>
+Si ocurre nuevamente entonces su archivo de base de datos puede estar corrupto.</translation>
     </message>
     <message>
         <source>(HMAC mismatch)</source>
@@ -3771,21 +3771,21 @@ Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</transl
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation>No es una BB.DD. KeePass.</translation>
+        <translation>No es una base de datos KeePass.</translation>
     </message>
     <message>
         <source>The selected file is an old KeePass 1 database (.kdb).
 
 You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
 This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>El fichero seleccionado es una vieja BB.DD. de KeePass 1 (.kdb).
+        <translation>El fichero seleccionado es una vieja base de datos de KeePass 1 (.kdb).
 
-Puede importarla haciendo clic en BB.DD. &gt; &apos;Importar BB.DD. KeePass 1...&apos;.
-Esta migración es en único sentido. No podrá abrir la BB.DD. importada con la vieja versión 0.4 de KeePassX.</translation>
+Puede importarla haciendo clic en base de datos &gt; «Importar base de datos KeePass 1...».
+Esta migración es en único sentido. No podrá abrir la base de datos importada con la vieja versión 0.4 de KeePassX.</translation>
     </message>
     <message>
         <source>Unsupported KeePass 2 database version.</source>
-        <translation>Versión de la BB.DD. de KeePass 2 no mantenida.</translation>
+        <translation>Versión de la base de datos de KeePass 2 no soportada.</translation>
     </message>
     <message>
         <source>Invalid cipher uuid length: %1 (length=%2)</source>
@@ -3797,7 +3797,7 @@ Esta migración es en único sentido. No podrá abrir la BB.DD. importada con la
     </message>
     <message>
         <source>Failed to read database file.</source>
-        <translation>Error al leer el fichero de BB.DD.</translation>
+        <translation>Error al leer el archivo de base de datos.</translation>
     </message>
 </context>
 <context>
@@ -3852,19 +3852,19 @@ Esta migración es en único sentido. No podrá abrir la BB.DD. importada con la
     </message>
     <message>
         <source>Null entry uuid</source>
-        <translation>Uuid de apunte nulo</translation>
+        <translation>Uuid de entrada nulo</translation>
     </message>
     <message>
         <source>Invalid entry icon number</source>
-        <translation>Número de ícono de apunte inválido</translation>
+        <translation>Número de ícono de entrada inválido</translation>
     </message>
     <message>
         <source>History element in history entry</source>
-        <translation>Elemento del historial en el apunte del historial</translation>
+        <translation>Elemento del historial en la entrada del historial</translation>
     </message>
     <message>
         <source>No entry uuid found</source>
-        <translation>No uuid de apunte encontrado</translation>
+        <translation>No uuid de entrada encontrado</translation>
     </message>
     <message>
         <source>History element with different uuid</source>
@@ -3876,7 +3876,7 @@ Esta migración es en único sentido. No podrá abrir la BB.DD. importada con la
     </message>
     <message>
         <source>Entry string key or value missing</source>
-        <translation>Falta clave de apunte de texto o valor</translation>
+        <translation>Falta clave de la entrada de texto o valor</translation>
     </message>
     <message>
         <source>Duplicate attachment found</source>
@@ -3884,7 +3884,7 @@ Esta migración es en único sentido. No podrá abrir la BB.DD. importada con la
     </message>
     <message>
         <source>Entry binary key or value missing</source>
-        <translation>Falta clave de apunte binaria o valor</translation>
+        <translation>Falta clave de entrada binaria o valor</translation>
     </message>
     <message>
         <source>Auto-type association window or sequence missing</source>
@@ -3932,22 +3932,22 @@ Línea %2, columna %3</translation>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Unable to open the database.</source>
-        <translation>No se pudo abrir la BB.DD.</translation>
+        <translation>No se pudo abrir la base de datos.</translation>
     </message>
     <message>
         <source>Import KeePass1 Database</source>
-        <translation>Importar BB.DD. KeePass1</translation>
+        <translation>Importar base de datos KeePass1</translation>
     </message>
 </context>
 <context>
     <name>KeePass1Reader</name>
     <message>
         <source>Unable to read keyfile.</source>
-        <translation>Incapaz de leer el fichero</translation>
+        <translation>Incapaz de leer el archivo</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation>No es una BB.DD. KeePass.</translation>
+        <translation>No es una base de datos KeePass.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
@@ -3955,7 +3955,7 @@ Línea %2, columna %3</translation>
     </message>
     <message>
         <source>Unsupported KeePass database version.</source>
-        <translation>Versión de la BB.DD. KeePass no mantenida.</translation>
+        <translation>Versión de la base de datos KeePass no mantenida.</translation>
     </message>
     <message>
         <source>Unable to read encryption IV</source>
@@ -3968,7 +3968,7 @@ Línea %2, columna %3</translation>
     </message>
     <message>
         <source>Invalid number of entries</source>
-        <translation>Número de apuntes no válido</translation>
+        <translation>Número de entradas no válido</translation>
     </message>
     <message>
         <source>Invalid content hash size</source>
@@ -4052,39 +4052,39 @@ Línea %2, columna %3</translation>
     </message>
     <message>
         <source>Invalid entry field size</source>
-        <translation>Tamaño del apunte para el campo inválido</translation>
+        <translation>Tamaño de la entrada para el campo inválido</translation>
     </message>
     <message>
         <source>Read entry field data doesn&apos;t match size</source>
-        <translation>Datos de campo de apunte no coinciden en tamaño</translation>
+        <translation>Datos de campo de entrada no coinciden en tamaño</translation>
     </message>
     <message>
         <source>Invalid entry uuid field size</source>
-        <translation>Tamaño del apunte para el campo uuid inválido</translation>
+        <translation>Tamaño de la entrada para el campo uuid inválido</translation>
     </message>
     <message>
         <source>Invalid entry group id field size</source>
-        <translation>Tamaño del apunte para el campo identificador de grupo inválido</translation>
+        <translation>Tamaño de la entrada para el campo identificador de grupo inválido</translation>
     </message>
     <message>
         <source>Invalid entry icon field size</source>
-        <translation>Tamaño del apunte para el campo icono inválido</translation>
+        <translation>Tamaño de la entrada para el campo icono inválido</translation>
     </message>
     <message>
         <source>Invalid entry creation time field size</source>
-        <translation>Tamaño del apunte para el campo tiempo de creación inválido</translation>
+        <translation>Tamaño de la entrada para el campo tiempo de creación inválido</translation>
     </message>
     <message>
         <source>Invalid entry modification time field size</source>
-        <translation>Tamaño del apunte para el campo tiempo de modificación inválido</translation>
+        <translation>Tamaño de la entrada para el campo tiempo de modificación inválido</translation>
     </message>
     <message>
         <source>Invalid entry expiry time field size</source>
-        <translation>Tamaño del apunte para el campo tiempo de expiración inválido</translation>
+        <translation>Tamaño de la entrada para el campo tiempo de expiración inválido</translation>
     </message>
     <message>
         <source>Invalid entry field type</source>
-        <translation>Tipo del apunte para el campo inválido</translation>
+        <translation>Tipo de la entrada para el campo inválido</translation>
     </message>
     <message>
         <source>unable to seek to content position</source>
@@ -4094,7 +4094,7 @@ Línea %2, columna %3</translation>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
         <translation>Se han proporcionado credenciales inválidas, inténtelo de nuevo.
-Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</translation>
+Si ocurre nuevamente entonces su archivo de base de datos puede estar corrupto.</translation>
     </message>
 </context>
 <context>
@@ -4165,7 +4165,7 @@ Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</transl
     <message>
         <source>Add %1</source>
         <comment>Add a key component</comment>
-        <translation>Agregar %1</translation>
+        <translation>Añadir %1</translation>
     </message>
     <message>
         <source>Change %1</source>
@@ -4175,7 +4175,7 @@ Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</transl
     <message>
         <source>Remove %1</source>
         <comment>Remove a key component</comment>
-        <translation>Retirar %1</translation>
+        <translation>Eliminar %1</translation>
     </message>
     <message>
         <source>%1 set, click to change or remove</source>
@@ -4191,63 +4191,63 @@ Si ocurre nuevamente entonces su fichero de BB.DD. puede estar corrupto.</transl
     </message>
     <message>
         <source>Key File</source>
-        <translation>Fichero de claves</translation>
+        <translation>Archivo clave</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Puede agregar un fichero de claves que contiene bytes aleatorios para seguridad adicional.&lt;/p&gt;&lt;p&gt;¡Debes mantenerlo en secreto y nunca perderlo o te bloquearán!&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Puede añadir un archivo clave que contiene bytes aleatorios para seguridad adicional.&lt;/p&gt;&lt;p&gt;¡Debes mantenerlo en secreto y nunca perderlo o te bloquearán!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Formato de fichero llave heredado</translation>
+        <translation>Formato de archivo clave heredado</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please go to the master key settings and generate a new key file.</source>
-        <translation>Está utilizando un formato de fichero de claves heredado que puede convertirse
+        <translation>Está utilizando un formato de archivo clave heredado que puede convertirse
 sin soporte en el futuro.
 
-Vaya a la configuración de la clave maestra y genere un nuevo fichero de claves.</translation>
+Vaya a la configuración de la clave maestra y genere un nuevo archivo clave.</translation>
     </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
-        <translation>Error al cargar el fichero de claves «%1»
+        <translation>Error al cargar el archivo clave «%1»
 Mensaje: %2</translation>
     </message>
     <message>
         <source>Key files</source>
-        <translation>Ficheros llave</translation>
+        <translation>Archivos clave</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos los ficheros</translation>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
         <source>Create Key File...</source>
-        <translation>Crear un fichero llave...</translation>
+        <translation>Crear un archivo clave...</translation>
     </message>
     <message>
         <source>Error creating key file</source>
-        <translation>Error al crear el fichero de claves</translation>
+        <translation>Error al crear el archivo clave</translation>
     </message>
     <message>
         <source>Unable to create key file: %1</source>
-        <translation>No se puede crear el fichero de claves: %1</translation>
+        <translation>No se puede crear el archivo clave: %1</translation>
     </message>
     <message>
         <source>Select a key file</source>
-        <translation>Seleccione un fichero llave</translation>
+        <translation>Seleccione un archivo clave</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation>Selección de fichero de llave </translation>
+        <translation>Selección de archivo clave </translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Explorar para un fichero de claves</translation>
+        <translation>Explorar para un archivo clave</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -4255,29 +4255,29 @@ Mensaje: %2</translation>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation>Generar un nuevo fichero de claves</translation>
+        <translation>Generar un nuevo archivo clave</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Nota: no use un fichero que pueda cambiar dado que lo imsolicitará desbloquear la BB.DD.</translation>
+        <translation>Nota: no use un archivo que pueda cambiar dado que impedirá desbloquear la base de datos.</translation>
     </message>
     <message>
         <source>Invalid Key File</source>
-        <translation>Fichero de claves inválido</translation>
+        <translation>Archivo clave inválido</translation>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
-        <translation>No puede usar la BB.DD. actual como su propio fichero de claves. Seleccione un fichero diferente o genere un nuevo fichero de claves.</translation>
+        <translation>No puede usar la base de datos actual como su propio archivo clave. Seleccione un archivo diferente o genere un nuevo archivo clave.</translation>
     </message>
     <message>
         <source>Suspicious Key File</source>
-        <translation>Fichero de claves sospechoso</translation>
+        <translation>Archivo clave sospechoso</translation>
     </message>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation>El fichero de claves seleccionado parece una BB.DD. de contraseñas. Un fichero de claves debe ser un fichero estático que nunca cambie o perderá el acceso a su BB.DD. para siempre.
-¿Desea continuar con este fichero?</translation>
+        <translation>El archivo clave seleccionado parece una base de datos de contraseñas. Un archivo clave debe ser un fichero estático que nunca cambie o perderá el acceso a su base de datos para siempre.
+¿Desea continuar con este archivo?</translation>
     </message>
 </context>
 <context>
@@ -4296,7 +4296,7 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>E&amp;ntries</source>
-        <translation>Apu&amp;ntes</translation>
+        <translation>E&amp;ntradas</translation>
     </message>
     <message>
         <source>&amp;Groups</source>
@@ -4316,19 +4316,19 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>&amp;Open database...</source>
-        <translation>&amp;Abrir BB.DD...</translation>
+        <translation>&amp;Abrir base de datos...</translation>
     </message>
     <message>
         <source>&amp;Save database</source>
-        <translation>&amp;Guardar BB.DD.</translation>
+        <translation>&amp;Guardar base de datos</translation>
     </message>
     <message>
         <source>&amp;Close database</source>
-        <translation>&amp;Cerrar BB.DD.</translation>
+        <translation>&amp;Cerrar base de datos</translation>
     </message>
     <message>
         <source>&amp;Delete entry</source>
-        <translation>&amp;Borrar apunte</translation>
+        <translation>&amp;Eliminar entrada</translation>
     </message>
     <message>
         <source>&amp;Edit group</source>
@@ -4336,23 +4336,23 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>&amp;Delete group</source>
-        <translation>&amp;Borrar grupo</translation>
+        <translation>&amp;Eliminar grupo</translation>
     </message>
     <message>
         <source>Sa&amp;ve database as...</source>
-        <translation>&amp;Guardar BB.DD. como...</translation>
+        <translation>&amp;Guardar base de datos como...</translation>
     </message>
     <message>
         <source>Database settings</source>
-        <translation>Configuración de la BB.DD.</translation>
+        <translation>Configuración de la base de datos.</translation>
     </message>
     <message>
         <source>&amp;Clone entry</source>
-        <translation>&amp;Clonar apunte</translation>
+        <translation>&amp;Clonar entrada</translation>
     </message>
     <message>
         <source>Copy &amp;username</source>
-        <translation>Copiar nombre de &amp;usuario</translation>
+        <translation>Copiar &amp;usuario</translation>
     </message>
     <message>
         <source>Copy username to clipboard</source>
@@ -4396,7 +4396,7 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Exportar a un fichero CSV...</translation>
+        <translation>&amp;Exportar a un archivo CSV...</translation>
     </message>
     <message>
         <source>Set up TOTP...</source>
@@ -4416,7 +4416,7 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>Access error for config file %1</source>
-        <translation>Error de acceso al fichero de configuración %1</translation>
+        <translation>Error de acceso al archivo de configuración %1</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -4470,35 +4470,35 @@ Le recomendamos que utilice la AppImage disponible en nuestra página de descarg
     </message>
     <message>
         <source>&amp;New database...</source>
-        <translation>&amp;Nueva BB.DD...</translation>
+        <translation>&amp;Nueva base de datos...</translation>
     </message>
     <message>
         <source>Create a new database</source>
-        <translation>Crear una nueva BB.DD.</translation>
+        <translation>Crear una base de datos nueva</translation>
     </message>
     <message>
         <source>&amp;Merge from database...</source>
-        <translation>&amp;Combinar desde la BB.DD...</translation>
+        <translation>&amp;Combinar desde la base de datos...</translation>
     </message>
     <message>
         <source>Merge from another KDBX database</source>
-        <translation>Combinar desde otra BB.DD. KDBX</translation>
+        <translation>Combinar desde otra base de datos KDBX</translation>
     </message>
     <message>
         <source>&amp;New entry</source>
-        <translation>&amp;Nueva apunte</translation>
+        <translation>&amp;Nueva entrada</translation>
     </message>
     <message>
         <source>Add a new entry</source>
-        <translation>Agregar una nueva apunte</translation>
+        <translation>Añadir una nueva entrada</translation>
     </message>
     <message>
         <source>&amp;Edit entry</source>
-        <translation>&amp;Editar apunte</translation>
+        <translation>&amp;Editar entrada</translation>
     </message>
     <message>
         <source>View or edit entry</source>
-        <translation>Ver o editar apunte</translation>
+        <translation>Ver o editar entrada</translation>
     </message>
     <message>
         <source>&amp;New group</source>
@@ -4506,7 +4506,7 @@ Le recomendamos que utilice la AppImage disponible en nuestra página de descarg
     </message>
     <message>
         <source>Add a new group</source>
-        <translation>Agregar un nuevo grupo</translation>
+        <translation>Añadir un nuevo grupo</translation>
     </message>
     <message>
         <source>Change master &amp;key...</source>
@@ -4530,19 +4530,19 @@ Le recomendamos que utilice la AppImage disponible en nuestra página de descarg
     </message>
     <message>
         <source>KeePass 1 database...</source>
-        <translation>BB.DD. KeePass 1...</translation>
+        <translation>Base de datos KeePass 1...</translation>
     </message>
     <message>
         <source>Import a KeePass 1 database</source>
-        <translation>Importar una BB.DD. KeePass 1</translation>
+        <translation>Importar una base de datos KeePass 1</translation>
     </message>
     <message>
         <source>CSV file...</source>
-        <translation>Fichero CSV...</translation>
+        <translation>Archivo CSV...</translation>
     </message>
     <message>
         <source>Import a CSV file</source>
-        <translation>Importar un fichero CSV</translation>
+        <translation>Importar un archivo CSV</translation>
     </message>
     <message>
         <source>Show TOTP...</source>
@@ -4592,7 +4592,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation>&amp;Generador de contraseña</translation>
+        <translation>&amp;Generador de contraseñas</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4600,7 +4600,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>&amp;Export to HTML file...</source>
-        <translation>&amp;Exportar a fichero HTML...</translation>
+        <translation>&amp;Exportar a archivo HTML...</translation>
     </message>
     <message>
         <source>1Password Vault...</source>
@@ -4655,7 +4655,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>older entry merged from database &quot;%1&quot;</source>
-        <translation>el apunte más antigua se fusionó a la BB.DD. &quot;%1&quot;</translation>
+        <translation>la entrada más antigua se combinó a la base de datos «%1»</translation>
     </message>
     <message>
         <source>Adding backup for older target %1 [%2]</source>
@@ -4667,11 +4667,11 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Reapplying older target entry on top of newer source %1 [%2]</source>
-        <translation>Volver a aplicar un apunte de destino más antigua sobre la tipografía más nueva %1 [%2]</translation>
+        <translation>Volver a aplicar una entrada de destino más antigua sobre la tipografía más nueva %1 [%2]</translation>
     </message>
     <message>
         <source>Reapplying older source entry on top of newer target %1 [%2]</source>
-        <translation>Volver a aplicar un apunte de origen anterior sobre el objetivo más nuevo %1 [%2]</translation>
+        <translation>Volver a aplicar una entrada de origen anterior sobre el objetivo más nuevo %1 [%2]</translation>
     </message>
     <message>
         <source>Synchronizing from newer source %1 [%2]</source>
@@ -4683,15 +4683,15 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Deleting child %1 [%2]</source>
-        <translation>Borrando descendiente %1[%2]</translation>
+        <translation>Eliminando descendiente %1 [%2]</translation>
     </message>
     <message>
         <source>Deleting orphan %1 [%2]</source>
-        <translation>Borrando huérfano %1 [%2]</translation>
+        <translation>Eliminando huérfano %1 [%2]</translation>
     </message>
     <message>
         <source>Changed deleted objects</source>
-        <translation>Cambiados objetos borrados</translation>
+        <translation>Cambiados objetos eliminados</translation>
     </message>
     <message>
         <source>Adding missing icon %1</source>
@@ -4710,7 +4710,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     <name>NewDatabaseWizard</name>
     <message>
         <source>Create a new KeePassXC database...</source>
-        <translation>Crear una nueva BB.DD. KeePassXC ...</translation>
+        <translation>Crear una base de datos nueva KeePassXC...</translation>
     </message>
     <message>
         <source>Root</source>
@@ -4730,7 +4730,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation>Aquí puede ajustar la configuración de cifrado de la BB.DD. No se preocupe, puede cambiarlo más adelante en la configuración de la BB.DD.</translation>
+        <translation>Aquí puede ajustar la configuración de cifrado de la base de datos. No se preocupe, puede cambiarlo más adelante en la configuración de la base de datos.</translation>
     </message>
     <message>
         <source>Advanced Settings</source>
@@ -4745,33 +4745,33 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     <name>NewDatabaseWizardPageEncryption</name>
     <message>
         <source>Encryption Settings</source>
-        <translation>Configuraciones de Cifrado</translation>
+        <translation>Configuraciones de cifrado</translation>
     </message>
     <message>
         <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation>Aquí puede ajustar la configuración de cifrado de la BB.DD. No se preocupe, puede cambiarla más adelante en la configuración de la BB.DD.</translation>
+        <translation>Aquí puede ajustar la configuración de cifrado de la base de datos. No se preocupe, puede cambiarla más adelante en la configuración de la base de datos.</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizardPageMasterKey</name>
     <message>
         <source>Database Master Key</source>
-        <translation>Clave maestra de la BB.DD.</translation>
+        <translation>Clave maestra de la base de datos</translation>
     </message>
     <message>
         <source>A master key known only to you protects your database.</source>
-        <translation>Una clave maestra, conocida únicamente por usted, protege su BB.DD.</translation>
+        <translation>Una clave maestra, conocida únicamente por usted, protege su base de datos.</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizardPageMetaData</name>
     <message>
         <source>General Database Information</source>
-        <translation>Información general de la BB.DD.</translation>
+        <translation>Información general de la base de datos</translation>
     </message>
     <message>
         <source>Please fill in the display name and an optional description for your new database:</source>
-        <translation>Rellene el nombre y añada una descripción opcional para su nueva BB.DD.:</translation>
+        <translation>Rellene el nombre y añada una descripción opcional para su nueva base de datos:</translation>
     </message>
 </context>
 <context>
@@ -4810,7 +4810,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     <message>
         <source>Read Database did not produce an instance
 %1</source>
-        <translation>Leer la BB.DD. no produce una instancia
+        <translation>Leer la base de datos no produce una instancia
 %1</translation>
     </message>
 </context>
@@ -4845,7 +4845,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     <name>OpenSSHKey</name>
     <message>
         <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation>Fichero llave no válido, esperando una llave de OpenSSH</translation>
+        <translation>Archivo clave no válido, esperando una llave de OpenSSH</translation>
     </message>
     <message>
         <source>PEM boundary mismatch</source>
@@ -4857,11 +4857,11 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Key file way too small.</source>
-        <translation>Fichero llave demasiado pequeño.</translation>
+        <translation>Archivo clave demasiado pequeño.</translation>
     </message>
     <message>
         <source>Key file magic header id invalid</source>
-        <translation>Id de encabezado mágico del fichero llave inválido</translation>
+        <translation>Id de encabezado mágico del archivo clave inválido</translation>
     </message>
     <message>
         <source>Found zero keys</source>
@@ -4873,7 +4873,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
-        <translation>Fichero de claves corrupto, no se pudo leer la clave privada</translation>
+        <translation>Archivo clave corrupto, no se pudo leer la clave privada</translation>
     </message>
     <message>
         <source>No private key payload to decrypt</source>
@@ -4889,7 +4889,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Key derivation failed, key file corrupted?</source>
-        <translation>La derivación de la clave falló, ¿fichero de claves dañado?</translation>
+        <translation>La derivación de la clave falló, ¿archivo clave dañado?</translation>
     </message>
     <message>
         <source>Decryption failed, wrong passphrase?</source>
@@ -4897,7 +4897,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Unexpected EOF while reading public key</source>
-        <translation>FDF inesperado al leer la clave pública</translation>
+        <translation>Final de fichero inesperado al leer la clave pública</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading private key</source>
@@ -4967,7 +4967,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>&lt;p&gt;A password is the primary method for securing your database.&lt;/p&gt;&lt;p&gt;Good passwords are long and unique. KeePassXC can generate one for you.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;La contraseña es el método principal para asegurar su BB.DD.&lt;/p&gt;&lt;p&gt;Las contraseñas buenas son largas y únicas. KeePassXC puede generar una para usted.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;La contraseña es el método principal para asegurar su base de datos.&lt;/p&gt;&lt;p&gt;Las contraseñas buenas son largas y únicas. KeePassXC puede generar una para usted.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Passwords do not match.</source>
@@ -5043,7 +5043,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Passphrase</source>
-        <translation>Frase Contraseña</translation>
+        <translation>Frase de contraseña</translation>
     </message>
     <message>
         <source>Wordlist:</source>
@@ -5175,7 +5175,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Add non-hex letters to &quot;do not include&quot; list</source>
-        <translation>Agregar letras no-hexadecimales al listado de «no incluir»</translation>
+        <translation>Añadir letras no-hexadecimales al listado de «no incluir»</translation>
     </message>
     <message>
         <source>Hex</source>
@@ -5187,7 +5187,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Word Co&amp;unt:</source>
-        <translation>C&amp;uenta de palabras:</translation>
+        <translation>&amp;Número de palabras:</translation>
     </message>
     <message>
         <source>Regenerate</source>
@@ -5281,7 +5281,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Delete</source>
-        <translation>Borrar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Move</source>
@@ -5293,11 +5293,11 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Remove</source>
-        <translation>Retirar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Skip</source>
-        <translation>Descartar</translation>
+        <translation>Omitir</translation>
     </message>
     <message>
         <source>Disable</source>
@@ -5316,11 +5316,11 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     <name>QObject</name>
     <message>
         <source>Database not opened</source>
-        <translation>BB.DD. no abierta</translation>
+        <translation>Base de datos no abierta</translation>
     </message>
     <message>
         <source>Database hash not available</source>
-        <translation>Hash de la BB.DD. no disponible</translation>
+        <translation>Hash de la base de datos no disponible</translation>
     </message>
     <message>
         <source>Client public key not received</source>
@@ -5364,15 +5364,15 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Add a new entry to a database.</source>
-        <translation>Agregar una nueva apunte a una BB.DD.</translation>
+        <translation>Añadir una nueva entrada a una base de datos.</translation>
     </message>
     <message>
         <source>Path of the database.</source>
-        <translation>Ruta a la BB.DD.</translation>
+        <translation>Ruta a la base de datos</translation>
     </message>
     <message>
         <source>Key file of the database.</source>
-        <translation>Fichero de llave de la BB.DD.</translation>
+        <translation>Archivo clave de la base de datos.</translation>
     </message>
     <message>
         <source>path</source>
@@ -5380,7 +5380,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Username for the entry.</source>
-        <translation>ID Usuario para el apunte.</translation>
+        <translation>Usuario para la entrada.</translation>
     </message>
     <message>
         <source>username</source>
@@ -5388,7 +5388,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>URL for the entry.</source>
-        <translation>URL del apunte.</translation>
+        <translation>URL de la entrada.</translation>
     </message>
     <message>
         <source>URL</source>
@@ -5396,11 +5396,11 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Prompt for the entry&apos;s password.</source>
-        <translation>Solicitar contraseña del apunte.</translation>
+        <translation>Solicitar contraseña de la entrada.</translation>
     </message>
     <message>
         <source>Generate a password for the entry.</source>
-        <translation>Generar una contraseña para el apunte.</translation>
+        <translation>Generar una contraseña para la entrada.</translation>
     </message>
     <message>
         <source>length</source>
@@ -5408,16 +5408,16 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Path of the entry to add.</source>
-        <translation>Ruta del apunte para agregar.</translation>
+        <translation>Ruta de la entrada para añadir.</translation>
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation>Copiar la contraseña de un apunte en el portapapeles.</translation>
+        <translation>Copiar la contraseña de una entrada en el portapapeles.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
         <comment>clip = copy to clipboard</comment>
-        <translation>Ruta del apunte para copiar.</translation>
+        <translation>Ruta de la entrada para copiar.</translation>
     </message>
     <message>
         <source>Timeout in seconds before clearing the clipboard.</source>
@@ -5425,11 +5425,11 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Edit an entry.</source>
-        <translation>Editar un apunte</translation>
+        <translation>Editar una entrada</translation>
     </message>
     <message>
         <source>Title for the entry.</source>
-        <translation>Título para el apunte</translation>
+        <translation>Título para la entrada</translation>
     </message>
     <message>
         <source>title</source>
@@ -5437,7 +5437,7 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
     </message>
     <message>
         <source>Path of the entry to edit.</source>
-        <translation>Ruta del apunte para editar.</translation>
+        <translation>Ruta de la entrada para editar.</translation>
     </message>
     <message>
         <source>Estimate the entropy of a password.</source>
@@ -5456,10 +5456,10 @@ Espere algunos defectos y problemas menores, esta versión no está destinada pa
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation>ADVERTENCIA: Está usando un fichero de claves con un formato antiguo que puede ser
+        <translation>ADVERTENCIA: Está usando un archivo clave con un formato antiguo que puede ser
 incompatible en el futuro.
 
-Por favor, considere generar un nuevo fichero.</translation>
+Por favor, considere generar un nuevo archivo.</translation>
     </message>
     <message>
         <source>
@@ -5477,7 +5477,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>List database entries.</source>
-        <translation>Alistar las apuntes de la BB.DD.</translation>
+        <translation>Listar las entrada de la base de datos.</translation>
     </message>
     <message>
         <source>Path of the group to list. Default is /</source>
@@ -5485,7 +5485,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Find entries quickly.</source>
-        <translation>Encontrar las apuntes rápidamente.</translation>
+        <translation>Encontrar las entradas rápidamente.</translation>
     </message>
     <message>
         <source>Search term.</source>
@@ -5497,19 +5497,19 @@ Comandos disponibles:
     </message>
     <message>
         <source>Path of the database to merge from.</source>
-        <translation>Ruta de la BB.DD. de inicio de la combinación.</translation>
+        <translation>Ruta de la base de datos de inicio de la combinación.</translation>
     </message>
     <message>
         <source>Use the same credentials for both database files.</source>
-        <translation>Utilizar las mismas credenciales para ambos ficheros de BB.DD.</translation>
+        <translation>Utilizar las mismas credenciales para ambos archivos de base de datos.</translation>
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
-        <translation>Fichero llave de la BB.DD. desde la cual desea combinar.</translation>
+        <translation>Archivo clave de la base de datos desde la cual desea combinar.</translation>
     </message>
     <message>
         <source>Show an entry&apos;s information.</source>
-        <translation>Muestra información de un apunte.</translation>
+        <translation>Muestra información de una entrada.</translation>
     </message>
     <message>
         <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
@@ -5521,7 +5521,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Name of the entry to show.</source>
-        <translation>Nombre del apunte para mostrar.</translation>
+        <translation>Nombre de la entrada para mostrar.</translation>
     </message>
     <message>
         <source>NULL device</source>
@@ -5549,7 +5549,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Username</source>
-        <translation>ID Usuario</translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
@@ -5603,19 +5603,19 @@ Comandos disponibles:
     </message>
     <message>
         <source>Could not create entry with path %1.</source>
-        <translation>No pudo crearse el apunte con ruta %1.</translation>
+        <translation>No pudo crearse la entrada con ruta %1.</translation>
     </message>
     <message>
         <source>Enter password for new entry: </source>
-        <translation>Introduzca la contraseña para la nueva apunte:</translation>
+        <translation>Introduzca la contraseña para la nueva entrada:</translation>
     </message>
     <message>
         <source>Writing the database failed %1.</source>
-        <translation>Falló escritura de la BB.DD. %1.</translation>
+        <translation>Falló escritura de la base de datos %1.</translation>
     </message>
     <message>
         <source>Successfully added entry %1.</source>
-        <translation>El apunte se agregó correctamente %1.</translation>
+        <translation>La entrada %1 se añadió correctamente.</translation>
     </message>
     <message>
         <source>Copy the current TOTP to the clipboard.</source>
@@ -5627,19 +5627,19 @@ Comandos disponibles:
     </message>
     <message>
         <source>Entry %1 not found.</source>
-        <translation>No se encontró el apunte %1.</translation>
+        <translation>No se encontró la entrada %1.</translation>
     </message>
     <message>
         <source>Entry with path %1 has no TOTP set up.</source>
-        <translation>El apunte con ruta %1 no tiene un TOTP configurado.</translation>
+        <translation>La entrada con ruta %1 no tiene un TOTP configurado.</translation>
     </message>
     <message>
         <source>Entry&apos;s current TOTP copied to the clipboard!</source>
-        <translation>¡El TOTP del apunte actual se ha copiado al portapapeles!</translation>
+        <translation>¡El TOTP de la entrada actual se ha copiado al portapapeles!</translation>
     </message>
     <message>
         <source>Entry&apos;s password copied to the clipboard!</source>
-        <translation>¡La contraseña del apunte actual se ha copiado al portapapeles!</translation>
+        <translation>¡La contraseña de la entrada actual se ha copiado al portapapeles!</translation>
     </message>
     <message numerus="yes">
         <source>Clearing the clipboard in %1 second(s)...</source>
@@ -5660,19 +5660,19 @@ Comandos disponibles:
     </message>
     <message>
         <source>Could not find entry with path %1.</source>
-        <translation>No se pudo encontrar el apunte con la ruta %1.</translation>
+        <translation>No se pudo encontrar la entrada con la ruta %1.</translation>
     </message>
     <message>
         <source>Not changing any field for entry %1.</source>
-        <translation>No cambiar cualquier campo de apunte de 1%.</translation>
+        <translation>No cambiar cualquier campo de la entrada de 1%.</translation>
     </message>
     <message>
         <source>Enter new password for entry: </source>
-        <translation>Introduzca una nueva contraseña para el apunte:</translation>
+        <translation>Introduzca una nueva contraseña para la entrada:</translation>
     </message>
     <message>
         <source>Writing the database failed: %1</source>
-        <translation>Fallo al escribir la BB.DD.: %1</translation>
+        <translation>Fallo al escribir la base de datos: %1</translation>
     </message>
     <message>
         <source>Successfully edited entry %1.</source>
@@ -5780,7 +5780,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Failed to load key file %1: %2</source>
-        <translation>Error al cargar el fichero de claves %1: %2</translation>
+        <translation>Error al cargar el archivo clave %1: %2</translation>
     </message>
     <message>
         <source>Length of the generated password</source>
@@ -5820,7 +5820,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Recursively list the elements of the group.</source>
-        <translation>Alistar recursivamente los elementos del grupo.</translation>
+        <translation>Listar recursivamente los elementos del grupo.</translation>
     </message>
     <message>
         <source>Cannot find group %1.</source>
@@ -5829,16 +5829,16 @@ Comandos disponibles:
     <message>
         <source>Error reading merge file:
 %1</source>
-        <translation>Error al leer el fichero a combinar:
+        <translation>Error al leer el archivo a combinar:
 %1</translation>
     </message>
     <message>
         <source>Unable to save database to file : %1</source>
-        <translation>No se puede guardar la BB.DD. en el fichero: %1</translation>
+        <translation>No se puede guardar la base de datos en el archivo: %1</translation>
     </message>
     <message>
         <source>Unable to save database to file: %1</source>
-        <translation>No se puede guardar la BB.DD. en el fichero: %1</translation>
+        <translation>No se puede guardar la base de datos en el archivo: %1</translation>
     </message>
     <message>
         <source>Successfully recycled entry %1.</source>
@@ -5846,11 +5846,11 @@ Comandos disponibles:
     </message>
     <message>
         <source>Successfully deleted entry %1.</source>
-        <translation>Se eliminó correctamente el apunte %1.</translation>
+        <translation>Se eliminó correctamente la entrada %1.</translation>
     </message>
     <message>
         <source>Show the entry&apos;s current TOTP.</source>
-        <translation>Muestra el apunte actual del TOTP.</translation>
+        <translation>Muestra la entrada actual del TOTP.</translation>
     </message>
     <message>
         <source>ERROR: unknown attribute %1.</source>
@@ -5866,7 +5866,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>file empty</source>
-        <translation>fichero vacío</translation>
+        <translation>archivo vacío</translation>
     </message>
     <message>
         <source>%1: (row, col) %2,%3</source>
@@ -5916,47 +5916,47 @@ Comandos disponibles:
     </message>
     <message>
         <source>Create a new database.</source>
-        <translation>Crear una nueva BB.DD.</translation>
+        <translation>Crear una base de datos nueva.</translation>
     </message>
     <message>
         <source>File %1 already exists.</source>
-        <translation>El fichero %1 ya existe.</translation>
+        <translation>El archivo %1 ya existe.</translation>
     </message>
     <message>
         <source>Loading the key file failed</source>
-        <translation>La carga del fichero de claves falló</translation>
+        <translation>La carga del archivo clave falló</translation>
     </message>
     <message>
         <source>No key is set. Aborting database creation.</source>
-        <translation>No se establece ninguna clave. Anulando la creación de BB.DD.</translation>
+        <translation>No se establece ninguna clave. Anulando la creación de base de datos.</translation>
     </message>
     <message>
         <source>Failed to save the database: %1.</source>
-        <translation>Error al guardar la BB.DD.: %1.</translation>
+        <translation>Error al guardar la base de datos: %1.</translation>
     </message>
     <message>
         <source>Successfully created new database.</source>
-        <translation>Creación correcta de nueva BB.DD.</translation>
+        <translation>Creación correcta de nueva base de datos.</translation>
     </message>
     <message>
         <source>Creating KeyFile %1 failed: %2</source>
-        <translation>Error al crear el fichero de clave %1: %2</translation>
+        <translation>Error al crear el archivo clave %1: %2</translation>
     </message>
     <message>
         <source>Loading KeyFile %1 failed: %2</source>
-        <translation>Error al cargar el fichero de claves %1: %2</translation>
+        <translation>Error al cargar el archivo clave %1: %2</translation>
     </message>
     <message>
         <source>Path of the entry to remove.</source>
-        <translation>Ruta del apunte a quitar.</translation>
+        <translation>Ruta de la entrada a eliminar.</translation>
     </message>
     <message>
         <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>El fichero de bloqueo de instancia única existente no es válido. Lanzando nueva instancia.</translation>
+        <translation>El archivo de bloqueo de instancia única existente no es válido. Lanzando nueva instancia.</translation>
     </message>
     <message>
         <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>El fichero de bloqueo no pudo ser creado. Modo de instancia única deshabilitado.</translation>
+        <translation>El archivo de bloqueo no pudo ser creado. Modo de instancia única deshabilitado.</translation>
     </message>
     <message>
         <source>KeePassXC - cross-platform password manager</source>
@@ -5964,19 +5964,19 @@ Comandos disponibles:
     </message>
     <message>
         <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nombre de fichero de la BB.DD. de contraseñas a abrir (*.kdbx)</translation>
+        <translation>nombre de archivo de la base de datos de contraseñas a abrir (*.kdbx)</translation>
     </message>
     <message>
         <source>path to a custom config file</source>
-        <translation>ruta a un fichero de configuración personalizado</translation>
+        <translation>ruta a un archivo de configuración personalizado</translation>
     </message>
     <message>
         <source>key file of the database</source>
-        <translation>fichero llave de la BB.DD.</translation>
+        <translation>archivo clave de la base de datos</translation>
     </message>
     <message>
         <source>read password of the database from stdin</source>
-        <translation>leer contraseña de la BB.DD. desdel apunte estándar</translation>
+        <translation>leer contraseña de la base de datos desde la entrada estándar</translation>
     </message>
     <message>
         <source>Parent window handle</source>
@@ -5996,7 +5996,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Database password: </source>
-        <translation>Contraseña de la BB.DD.:</translation>
+        <translation>Contraseña de la base de datos:</translation>
     </message>
     <message>
         <source>Cannot create new group</source>
@@ -6004,7 +6004,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Deactivate password key for the database.</source>
-        <translation>Desactivar contraseña para la BB.DD.</translation>
+        <translation>Desactivar contraseña para la base de datos.</translation>
     </message>
     <message>
         <source>Displays debugging information.</source>
@@ -6012,7 +6012,7 @@ Comandos disponibles:
     </message>
     <message>
         <source>Deactivate password key for the database to merge from.</source>
-        <translation>Desactivar contraseña para la BB.DD. desde la que combinar.</translation>
+        <translation>Desactivar contraseña para la base de datos desde la que combinar.</translation>
     </message>
     <message>
         <source>Version %1</source>
@@ -6088,11 +6088,11 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Adds a new group to a database.</source>
-        <translation>Añade un nuevo grupo a la BB.DD.</translation>
+        <translation>Añade un nuevo grupo a la base de datos.</translation>
     </message>
     <message>
         <source>Path of the group to add.</source>
-        <translation>Ruta del grupo a agregar.</translation>
+        <translation>Ruta del grupo a añadir.</translation>
     </message>
     <message>
         <source>Group %1 already exists!</source>
@@ -6108,7 +6108,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Check if any passwords have been publicly leaked. FILENAME must be the path of a file listing SHA-1 hashes of leaked passwords in HIBP format, as available from https://haveibeenpwned.com/Passwords.</source>
-        <translation>Comprueba si algunas contraseñas han sido filtradas públicamente. FILENAME debe ser la ruta de un fichero conteniendo «hashes» SHA-1 de las contraseñas filtradas en formato HIBP, como está disponible en https://haveibeenpwned.com/Passwords.</translation>
+        <translation>Comprueba si algunas contraseñas han sido filtradas públicamente. FILENAME debe ser la ruta de un archivo conteniendo «hashes» SHA-1 de las contraseñas filtradas en formato HIBP, como está disponible en https://haveibeenpwned.com/Passwords.</translation>
     </message>
     <message>
         <source>FILENAME</source>
@@ -6116,19 +6116,19 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Analyze passwords for weaknesses and problems.</source>
-        <translation>Analizar contraseñas débiles y problemas.</translation>
+        <translation>Analizar debilidades y problemas en las contraseñas.</translation>
     </message>
     <message>
         <source>Failed to open HIBP file %1: %2</source>
-        <translation>Fallo al abrir fichero HIBP %1: %2</translation>
+        <translation>Fallo al abrir archivo HIBP %1: %2</translation>
     </message>
     <message>
         <source>Evaluating database entries against HIBP file, this will take a while...</source>
-        <translation>Evaluando las apuntes de la BB.DD. contra el fichero HIBP, esto tomará un rato...</translation>
+        <translation>Evaluando las entrada de la base de datos contra el archivo HIBP, esto tomará un rato...</translation>
     </message>
     <message>
         <source>Close the currently opened database.</source>
-        <translation>Cerrar la BB.DD. abierta actual.</translation>
+        <translation>Cerrar la base de datos abierta actual.</translation>
     </message>
     <message>
         <source>Display this help.</source>
@@ -6136,7 +6136,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Yubikey slot used to encrypt the database.</source>
-        <translation>La ranura de YubiKey usada para cifrar la BB.DD.</translation>
+        <translation>La ranura de YubiKey usada para cifrar la base de datos.</translation>
     </message>
     <message>
         <source>slot</source>
@@ -6160,11 +6160,11 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Exports the content of a database to standard output in the specified format.</source>
-        <translation>Exporta el contenido de la BB.DD. en la salida estándar en el formato especificado.</translation>
+        <translation>Exporta el contenido de la base de datos en la salida estándar en el formato especificado.</translation>
     </message>
     <message>
         <source>Unable to export database to XML: %1</source>
-        <translation>No se puede exportar BB.DD. a XML: %1</translation>
+        <translation>No se puede exportar base de datos a XML: %1</translation>
     </message>
     <message>
         <source>Unsupported format %1</source>
@@ -6188,23 +6188,23 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Import the contents of an XML database.</source>
-        <translation>Importar los contenidos de la BB.DD. XML.</translation>
+        <translation>Importar los contenidos de la base de datos XML.</translation>
     </message>
     <message>
         <source>Path of the XML database export.</source>
-        <translation>Ruta de la exportación de la BB.DD. XML.</translation>
+        <translation>Ruta de la exportación de la base de datos XML.</translation>
     </message>
     <message>
         <source>Path of the new database.</source>
-        <translation>Ruta de la nueva BB.DD.</translation>
+        <translation>Ruta de la nueva base de datos.</translation>
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
-        <translation>No se puede importar la BB.DD. XML de la exportación %1</translation>
+        <translation>No se puede importar la base de datos XML de la exportación %1</translation>
     </message>
     <message>
         <source>Successfully imported database.</source>
-        <translation>BB.DD. importada correctamente.</translation>
+        <translation>Base de datos importada correctamente.</translation>
     </message>
     <message>
         <source>Unknown command %1</source>
@@ -6220,7 +6220,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Yubikey slot for the second database.</source>
-        <translation>Ranura YubiKey para la segunda BB.DD.</translation>
+        <translation>Ranura YubiKey para la segunda base de datos.</translation>
     </message>
     <message>
         <source>Successfully merged %1 into %2.</source>
@@ -6228,15 +6228,15 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
-        <translation>La BB.DD. no fue modificada por la operación de unión</translation>
+        <translation>La base de datos no fue modificada por la operación de combinar</translation>
     </message>
     <message>
         <source>Moves an entry to a new group.</source>
-        <translation>Mueve un apunte a un nuevo grupo.</translation>
+        <translation>Mueve una entrada a un nuevo grupo.</translation>
     </message>
     <message>
         <source>Path of the entry to move.</source>
-        <translation>Ruta del apunte a mover.</translation>
+        <translation>Ruta de la entrada a mover.</translation>
     </message>
     <message>
         <source>Path of the destination group.</source>
@@ -6248,7 +6248,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Entry is already in group %1.</source>
-        <translation>El apunte ya está en el grupo %1.</translation>
+        <translation>La entrada ya está en el grupo %1.</translation>
     </message>
     <message>
         <source>Successfully moved entry %1 to group %2.</source>
@@ -6256,7 +6256,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Open a database.</source>
-        <translation>Abrir BB.DD.</translation>
+        <translation>Abrir base de datos</translation>
     </message>
     <message>
         <source>Path of the group to remove.</source>
@@ -6264,7 +6264,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Cannot remove root group from database.</source>
-        <translation>No se puede eliminar grupo raíz de la BB.DD.</translation>
+        <translation>No se puede eliminar grupo raíz de la base de datos.</translation>
     </message>
     <message>
         <source>Successfully recycled group %1.</source>
@@ -6276,15 +6276,15 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not found</source>
-        <translation>Fallo al abrir fichero de BB.DD. %1: no encontrado</translation>
+        <translation>Fallo al abrir archivo de base de datos %1: no encontrado</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not a plain file</source>
-        <translation>Fallo al abrir fichero de BB.DD. %1: fichero de texto no plano</translation>
+        <translation>Fallo al abrir archivo de base de datos %1: archivo de texto no plano</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not readable</source>
-        <translation>Fallo al abrir fichero de BB.DD. %1: no leíble</translation>
+        <translation>Fallo al abrir archivo de base de datos %1: no leíble</translation>
     </message>
     <message>
         <source>Enter password to unlock %1: </source>
@@ -6300,11 +6300,11 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Enter password to encrypt database (optional): </source>
-        <translation>Introduzca la contraseña para cifrar la BB.DD. (opcional):</translation>
+        <translation>Introduzca la contraseña para cifrar la base de datos (opcional):</translation>
     </message>
     <message>
         <source>HIBP file, line %1: parse error</source>
-        <translation>Fichero HIBP, línea %1: error de analizado</translation>
+        <translation>Archivo HIBP, línea %1: error de analizado</translation>
     </message>
     <message>
         <source>Secret Service Integration</source>
@@ -6312,7 +6312,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>User name</source>
-        <translation>ID Usuario</translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <source>%1[%2] Challenge Response - Slot %3 - %4</source>
@@ -6377,7 +6377,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>No agent running, cannot add identity.</source>
-        <translation>Ningún agente en ejecución, no se puede agregar identidad.</translation>
+        <translation>Ningún agente en ejecución, no se puede añadir identidad.</translation>
     </message>
     <message>
         <source>No agent running, cannot remove identity.</source>
@@ -6503,19 +6503,19 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si la papelera de reciclaje está habilitada para la BB.DD., las apuntes serán movidas a la papelera directamente. Sino serán eliminadas sin confirmación.&lt;/p&gt;&lt;p&gt;Aún así se le solicitará si algun apunte es referenciada por otras.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si la papelera de reciclaje está habilitada para la base de datos, las entradas serán movidas a la papelera directamente. Sino serán eliminadas sin confirmación.&lt;/p&gt;&lt;p&gt;Aún así se le solicitará si alguna entrada es referenciada por otras.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation>No confirmar cuando las apuntes son eliminadas por los clientes.</translation>
+        <translation>No confirmar cuando las entrada son eliminadas por los clientes.</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
-        <translation>Exponer grupos de BB.DD.:</translation>
+        <translation>Exponer grupos de base de datos:</translation>
     </message>
     <message>
         <source>File Name</source>
-        <translation>Nombre de fichero</translation>
+        <translation>Nombre de archivo</translation>
     </message>
     <message>
         <source>Group</source>
@@ -6543,15 +6543,15 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Database settings</source>
-        <translation>Configuración de la BB.DD.</translation>
+        <translation>Configuración de la base de datos</translation>
     </message>
     <message>
         <source>Edit database settings</source>
-        <translation>Editar configuración de BB.DD.</translation>
+        <translation>Editar configuración de base de datos</translation>
     </message>
     <message>
         <source>Unlock database</source>
-        <translation>Desbloquear BB.DD.</translation>
+        <translation>Desbloquear base de datos</translation>
     </message>
     <message>
         <source>Unlock database to show more information</source>
@@ -6559,7 +6559,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Lock database</source>
-        <translation>Bloquear BB.DD.</translation>
+        <translation>Bloquear base de datos</translation>
     </message>
     <message>
         <source>Unlock to show</source>
@@ -6634,7 +6634,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Retirar</translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <source>Path</source>
@@ -6671,11 +6671,11 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>KeeShare key file</source>
-        <translation>Fichero de clave de KeeShare</translation>
+        <translation>Archivo clave de KeeShare</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos los ficheros</translation>
+        <translation>Todos los archivo</translation>
     </message>
     <message>
         <source>Select path</source>
@@ -6750,7 +6750,7 @@ Núcleo: %3 %4</translation>
     <name>ShareExport</name>
     <message>
         <source>Overwriting signed share container is not supported - export prevented</source>
-        <translation>No se soporta sobrescribir contenedor compartido  - exportación prevenido</translation>
+        <translation>No se soporta la sobrescritura de contenedor compartido sin firmar - exportación prevenida</translation>
     </message>
     <message>
         <source>Could not write export container (%1)</source>
@@ -6758,19 +6758,19 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>Could not embed signature: Could not open file to write (%1)</source>
-        <translation>No se puede incrustar la firma: no se puede abrir el fichero para escribir (%1)</translation>
+        <translation>No se puede incrustar la firma: no se puede abrir el archivo para escribir (%1)</translation>
     </message>
     <message>
         <source>Could not embed signature: Could not write file (%1)</source>
-        <translation>No se puede incrustar la firma: no se puede escribir el fichero (%1)</translation>
+        <translation>No se puede incrustar la firma: no se puede escribir el archivo (%1)</translation>
     </message>
     <message>
         <source>Could not embed database: Could not open file to write (%1)</source>
-        <translation>No se puede incrustar la BB.DD.: no se puede abrir el fichero para escribir (%1)</translation>
+        <translation>No se puede incrustar la base de datos: no se puede abrir el archivo para escribir (%1)</translation>
     </message>
     <message>
         <source>Could not embed database: Could not write file (%1)</source>
-        <translation>No se puede incrustar la BB.DD.: no se puede escribir el fichero (%1)</translation>
+        <translation>No se puede incrustar la base de datos.: no se puede escribir el archivo (%1)</translation>
     </message>
     <message>
         <source>Overwriting unsigned share container is not supported - export prevented</source>
@@ -6793,7 +6793,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?</source>
-        <translation>No podemos verificar la tipografía del contenedor compartido porque no está firmado. ¿Realmente desea importar desde %1?</translation>
+        <translation>No podemos verificar la tipografía del contenedor compartido porque no está firmado. ¿Desea importar desde %1?</translation>
     </message>
     <message>
         <source>Import from container with certificate</source>
@@ -6825,7 +6825,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>File is not readable</source>
-        <translation>El fichero no es legible</translation>
+        <translation>El archivo no es legible</translation>
     </message>
     <message>
         <source>Invalid sharing container</source>
@@ -6853,7 +6853,7 @@ Núcleo: %3 %4</translation>
     </message>
     <message>
         <source>File does not exist</source>
-        <translation>El fichero no existe</translation>
+        <translation>El archivo no existe</translation>
     </message>
     <message>
         <source>Unknown share container type</source>
@@ -6963,7 +6963,7 @@ Núcleo: %3 %4</translation>
     <message>
         <source> sec</source>
         <comment>Seconds</comment>
-        <translation>segundos</translation>
+        <translation> seg</translation>
     </message>
     <message>
         <source>Code size:</source>
@@ -7009,7 +7009,7 @@ Ejemplo: JBSWY3DPEHPK3PXP</translation>
     </message>
     <message>
         <source>Are you sure you want to delete TOTP settings for this entry?</source>
-        <translation>¿Desea eliminar la configuración TOTP para esta apunte?</translation>
+        <translation>¿Desea eliminar la configuración TOTP para esta entrada?</translation>
     </message>
 </context>
 <context>
@@ -7067,15 +7067,15 @@ Ejemplo: JBSWY3DPEHPK3PXP</translation>
     <name>WelcomeWidget</name>
     <message>
         <source>Start storing your passwords securely in a KeePassXC database</source>
-        <translation>Empiece a guardar sus contraseñas con seguridad en una BB.DD. de KeePassXC</translation>
+        <translation>Empiece a guardar sus contraseñas con seguridad en una base de datos de KeePassXC</translation>
     </message>
     <message>
         <source>Create new database</source>
-        <translation>Crear una nueva BB.DD.</translation>
+        <translation>Crear una base de datos nueva</translation>
     </message>
     <message>
         <source>Open existing database</source>
-        <translation>Abrir una BB.DD. existente</translation>
+        <translation>Abrir una base de datos existente</translation>
     </message>
     <message>
         <source>Import from KeePass 1</source>
@@ -7095,11 +7095,11 @@ Ejemplo: JBSWY3DPEHPK3PXP</translation>
     </message>
     <message>
         <source>Import from 1Password</source>
-        <translation>Importar desde 1Password</translation>
+        <translation>Importar de 1Password</translation>
     </message>
     <message>
         <source>Open a recent database</source>
-        <translation>Abrir BB.DD. reciente</translation>
+        <translation>Abrir base de datos reciente</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/keepassx_et.ts b/share/translations/keepassx_et.ts
index 3e4841d803..fc4db78c5b 100644
--- a/share/translations/keepassx_et.ts
+++ b/share/translations/keepassx_et.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC-d levitatakse vastavalt GNU Üldise Avaliku Litsentsi (GPL) versioonis 2 või (sinu valikul) versioonis 3 toodud tingimustele.</translation>
     </message>
     <message>
         <source>Contributors</source>
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Vaata kaasautoreid GitHubis&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Debug Info</source>
@@ -31,7 +31,7 @@
     </message>
     <message>
         <source>Include the following information whenever you report a bug:</source>
-        <translation type="unfinished"/>
+        <translation>Vigadest teatamisel tuleks alati lisada järgnev teave:</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
@@ -43,7 +43,7 @@
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC meeskonna eriline tänu kuulub debfx-ile algse KeePassX-i loomise eest.</translation>
     </message>
 </context>
 <context>
@@ -334,7 +334,7 @@
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasid lukustatakse, kui neid pole kasutatud kauem kui</translation>
     </message>
     <message>
         <source> min</source>
@@ -374,11 +374,11 @@
     </message>
     <message>
         <source>Don&apos;t use placeholder for empty password fields</source>
-        <translation type="unfinished"/>
+        <translation>Tühje paroole ei varjata täppidega</translation>
     </message>
     <message>
         <source>Hide passwords in the entry preview panel</source>
-        <translation>Paroolid peidetakse kirjete eelvaatepaneelil</translation>
+        <translation>Kirjete eelvaatepaneelil varjatakse paroolid täppidega</translation>
     </message>
     <message>
         <source>Hide entry notes by default</source>
@@ -422,7 +422,7 @@
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Automaatsisestus - KeePassXC</translation>
+        <translation>Automaatsisestus – KeePassXC</translation>
     </message>
     <message>
         <source>Auto-Type</source>
@@ -430,19 +430,19 @@
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation type="unfinished"/>
+        <translation>Määratud automaatsisestuse süntaks on vigane.</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>See automaatsisestus sisaldab väga pikka viivitust. Kas oled kindel, et soovid jätkata?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>See automaatsisestus sisaldab väga aeglasi klahvivajutusi. Kas oled kindel, et soovid jätkata?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>See automaatsisestus sisaldab väga sageli korduvaid argumente. Kas oled kindel, et soovid jätkata?</translation>
     </message>
     <message>
         <source>Permission Required</source>
@@ -513,7 +513,7 @@
     <name>AutoTypeSelectDialog</name>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Automaatsisestus - KeePassXC</translation>
+        <translation>Automaatsisestus – KeePassXC</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
@@ -528,39 +528,40 @@
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC-Browseri ligipääsukinnitus</translation>
     </message>
     <message>
         <source>Remember this decision</source>
-        <translation type="unfinished"/>
+        <translation>Otsus jäetakse meelde</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation type="unfinished"/>
+        <translation>Luba</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"/>
+        <translation>Keela</translation>
     </message>
     <message>
         <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
-        <translation type="unfinished"/>
+        <translation>%1 soovib ligipääsu alltoodud kirje(te) paroolile.
+Kas lubada ligipääs?</translation>
     </message>
     <message>
         <source>Allow access</source>
-        <translation type="unfinished"/>
+        <translation>Luba ligipääs</translation>
     </message>
     <message>
         <source>Deny access</source>
-        <translation type="unfinished"/>
+        <translation>Keela ligipääs</translation>
     </message>
 </context>
 <context>
     <name>BrowserEntrySaveDialog</name>
     <message>
         <source>KeePassXC-Browser Save Entry</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC-Browseri kirje salvestamine</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -573,18 +574,19 @@ Please select whether you want to allow access.</source>
     <message>
         <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Sul on avatud mitu andmebaasi.
+Vali, millisesse neist tunnused salvestada tuleks.</translation>
     </message>
 </context>
 <context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Dialoog</translation>
     </message>
     <message>
         <source>This is required for accessing your databases with KeePassXC-Browser</source>
-        <translation type="unfinished"/>
+        <translation>See on vajalik andmebaasidele KeePassXC-Browseri abil ligipääsemiseks.</translation>
     </message>
     <message>
         <source>General</source>
@@ -613,7 +615,7 @@ Please select the correct database for saving credentials.</source>
     <message>
         <source>Show a &amp;notification when credentials are requested</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>Tunnuste taotlemisel kuvatakse märguanne</translation>
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
@@ -621,11 +623,11 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
-        <translation type="unfinished"/>
+        <translation>Kui see ruut on märgitud, tagastatakse ainult kirjed, mille URL-il on sama skeem (http, https vms) nagu aktiivsel veebilehel.</translation>
     </message>
     <message>
         <source>&amp;Match URL scheme (e.g., https://...)</source>
-        <translation type="unfinished"/>
+        <translation>Nõutakse &amp;URL-i skeemi vastavust (nt https://... vs. http://...)</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
@@ -652,21 +654,21 @@ Please select the correct database for saving credentials.</source>
     <message>
         <source>Never &amp;ask before accessing credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>Tunnuste &amp;kasutamisel ei küsita kinnitust</translation>
     </message>
     <message>
         <source>Never ask before &amp;updating credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>Tunnuste &amp;uuendamisel ei küsita kinnitust</translation>
     </message>
     <message>
         <source>Searc&amp;h in all opened databases for matching credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>Tunnuseid otsitakse kõigist avatud andme&amp;baasidest</translation>
     </message>
     <message>
         <source>Automatically creating or updating string fields is not supported.</source>
-        <translation type="unfinished"/>
+        <translation>Stringiväljade automaatne loomine või uuendamine pole toetatud.</translation>
     </message>
     <message>
         <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
@@ -682,20 +684,20 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel lubatakse KeePassXC ja brauserilaienduse vahelise puhverrakenduse tugi.</translation>
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC ja brauserilaienduse vahel kasutatakse &amp;puhverrakendust</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
-        <translation type="unfinished"/>
+        <translation>Kui paigaldasid puhverrakenduse käsitsi, saab siin määrata selle asukoha.</translation>
     </message>
     <message>
         <source>Use a &amp;custom proxy location</source>
         <comment>Meant is the proxy for KeePassXC-Browser</comment>
-        <translation type="unfinished"/>
+        <translation>Kasutatakse kohandatud puhver&amp;rakenduse asukohta:</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -725,7 +727,7 @@ Please select the correct database for saving credentials.</source>
     <message>
         <source>Do not ask permission for HTTP &amp;Basic Auth</source>
         <extracomment>An extra HTTP Basic Auth setting</extracomment>
-        <translation type="unfinished"/>
+        <translation>&amp;HTTP lihtautentimiseks luba ei küsita</translation>
     </message>
     <message>
         <source>Due to Snap sandboxing, you must run a script to enable browser integration.&lt;br /&gt;You can obtain this script from %1</source>
@@ -733,7 +735,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Please see special instructions for browser extension use below</source>
-        <translation type="unfinished"/>
+        <translation>Vaata allpool brauserilaienduse kasutamise erijuhiseid.</translation>
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2. %3</source>
@@ -745,11 +747,11 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel tagastatakse ka aegunud tunnused. Nende pealkirja ette lisatakse [aegunud].</translation>
     </message>
     <message>
         <source>&amp;Allow returning expired credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Lubatakse &amp;aegunud tunnuste tagastamine</translation>
     </message>
     <message>
         <source>Enable browser integration</source>
@@ -757,23 +759,23 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Browsers installed as snaps are currently not supported.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;i&gt;Snap&lt;/i&gt;&apos;ina paigaldatud brausereid praegu ei toetata.</translation>
     </message>
     <message>
         <source>All databases connected to the extension will return matching credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel tagastatakse sobivad tunnused kõigist laiendusega ühendatud andmebaasidest.</translation>
     </message>
     <message>
         <source>Don&apos;t display the popup suggesting migration of legacy KeePassHTTP settings.</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel ei näidata hüpikakent, mis pakub KeePassHTTP pärandseadistuse migreerimist.</translation>
     </message>
     <message>
         <source>&amp;Do not prompt for KeePassHTTP settings migration.</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ei pakuta KeePassHTTP seadistuse ülekolimist</translation>
     </message>
     <message>
         <source>Custom proxy location field</source>
-        <translation type="unfinished"/>
+        <translation>Kohandatud puhverrakenduse asukoha väli</translation>
     </message>
     <message>
         <source>Browser for custom proxy file</source>
@@ -788,15 +790,15 @@ Please select the correct database for saving credentials.</source>
     <name>BrowserService</name>
     <message>
         <source>KeePassXC: New key association request</source>
-        <translation type="unfinished"/>
+        <translation>Uus ühendumistaotlus – KeePassXC</translation>
     </message>
     <message>
         <source>Save and allow access</source>
-        <translation type="unfinished"/>
+        <translation>Salvesta ja luba ligipääs</translation>
     </message>
     <message>
         <source>KeePassXC: Overwrite existing key?</source>
-        <translation type="unfinished"/>
+        <translation>Kirje ülekirjutamise kinnitus – KeePassXC</translation>
     </message>
     <message>
         <source>A shared encryption key with the name &quot;%1&quot; already exists.
@@ -805,7 +807,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
-        <translation type="unfinished"/>
+        <translation>Kirje uuendamine – KeePassXC</translation>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
@@ -846,7 +848,7 @@ Moved %2 keys to custom data.</source>
     </message>
     <message>
         <source>KeePassXC: Create a new group</source>
-        <translation type="unfinished"/>
+        <translation>Uue grupi loomine – KeePassXC</translation>
     </message>
     <message>
         <source>A request for creating a new group &quot;%1&quot; has been received.
@@ -870,7 +872,11 @@ Would you like to migrate your existing settings now?</source>
 
 Give the connection a unique name or ID, for example:
 chrome-laptop.</source>
-        <translation type="unfinished"/>
+        <translation>Saadi taotlus ühenduda järgmise andmebaasiga:
+%1
+
+Määra palun sellele ühendusele ainukordne nimi või ID, näiteks:
+chrome-laptop.</translation>
     </message>
 </context>
 <context>
@@ -896,43 +902,43 @@ chrome-laptop.</source>
     <name>CsvImportWidget</name>
     <message>
         <source>Import CSV fields</source>
-        <translation type="unfinished"/>
+        <translation>CSV väljade importimine</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation type="unfinished"/>
+        <translation>failinimi</translation>
     </message>
     <message>
         <source>size, rows, columns</source>
-        <translation type="unfinished"/>
+        <translation>maht, ridade arv, veergude arv</translation>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"/>
+        <translation>Kodeerimine</translation>
     </message>
     <message>
         <source>Codec</source>
-        <translation>Koodek</translation>
+        <translation>Kodeering:</translation>
     </message>
     <message>
         <source>Text is qualified by</source>
-        <translation type="unfinished"/>
+        <translation>Teksti eraldaja:</translation>
     </message>
     <message>
         <source>Fields are separated by</source>
-        <translation type="unfinished"/>
+        <translation>Väljade eraldaja:</translation>
     </message>
     <message>
         <source>Comments start with</source>
-        <translation type="unfinished"/>
+        <translation>Kommentaaride tähis:</translation>
     </message>
     <message>
         <source>First record has field names</source>
-        <translation type="unfinished"/>
+        <translation>Esimesel real on väljade nimed</translation>
     </message>
     <message>
         <source>Consider &apos;\&apos; an escape character</source>
-        <translation type="unfinished"/>
+        <translation>Längkriipsu &quot;\&quot; tuleb käsitleda paomärgina</translation>
     </message>
     <message>
         <source>Preview</source>
@@ -940,19 +946,19 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Column layout</source>
-        <translation type="unfinished"/>
+        <translation>Veergude paigutus</translation>
     </message>
     <message>
         <source>Not present in CSV file</source>
-        <translation type="unfinished"/>
+        <translation>ei esine CSV-failis</translation>
     </message>
     <message>
         <source>Imported from CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Imporditud CSV-failist</translation>
     </message>
     <message>
         <source>Original data: </source>
-        <translation type="unfinished"/>
+        <translation>Algsed andmed: </translation>
     </message>
     <message>
         <source>Error</source>
@@ -960,19 +966,19 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Empty fieldname %1</source>
-        <translation type="unfinished"/>
+        <translation>tühi välja nimi %1</translation>
     </message>
     <message>
         <source>column %1</source>
-        <translation type="unfinished"/>
+        <translation>%1. veerg</translation>
     </message>
     <message>
         <source>Error(s) detected in CSV file!</source>
-        <translation type="unfinished"/>
+        <translation>CSV-failis leiti vigu:</translation>
     </message>
     <message numerus="yes">
         <source>[%n more message(s) skipped]</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>[ja veel %n teade, mis jäeti vahele]</numerusform><numerusform>[ja veel %n teadet, mis jäeti vahele]</numerusform></translation>
     </message>
     <message>
         <source>CSV import: writer has errors:
@@ -985,35 +991,35 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Field separation</source>
-        <translation type="unfinished"/>
+        <translation>Väljade eraldaja</translation>
     </message>
     <message>
         <source>Number of header lines to discard</source>
-        <translation type="unfinished"/>
+        <translation>Eiratavate päiseridade arv:</translation>
     </message>
     <message>
         <source>CSV import preview</source>
-        <translation type="unfinished"/>
+        <translation>CSV importimise eelvaade</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
         <source>%n column(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n veerg</numerusform><numerusform>%n veergu</numerusform></translation>
     </message>
     <message>
         <source>%1, %2, %3</source>
         <comment>file info: bytes, rows, columns</comment>
-        <translation type="unfinished"/>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
         <source>%n byte(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n bait</numerusform><numerusform>%n baiti</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n row(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n rida</numerusform><numerusform>%n rida</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1029,7 +1035,7 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Unable to open file %1.</source>
-        <translation type="unfinished"/>
+        <translation>Faili &quot;%1&quot; avamine pole võimalik.</translation>
     </message>
     <message>
         <source>Error while reading the database: %1</source>
@@ -1069,7 +1075,7 @@ Backup database located at %2</source>
     <name>DatabaseOpenDialog</name>
     <message>
         <source>Unlock Database - KeePassXC</source>
-        <translation>Andmebaasi luku avamine - KeePassXC</translation>
+        <translation>Andmebaasi luku avamine – KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -1135,15 +1141,15 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Võtmefaili valimine</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Riistvaralise võtme pesa valimine</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Vali võtmefail</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1151,7 +1157,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Värskenda riistvaraliste võtmete loendit</translation>
     </message>
     <message>
         <source>Hardware Key:</source>
@@ -1182,7 +1188,10 @@ Please consider generating a new key file.</source>
 Do you want to retry with an &quot;empty&quot; password instead?
 
 To prevent this error from appearing, you must go to &quot;Database Settings / Security&quot; and reset your password.</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasi luku avamine ebaõnnestus ja parooli ei sisestatud.
+Kas soovid &quot;tühja&quot; parooliga uuesti proovida?
+
+Selle veateate ilmumise vältimiseks peaksid avama andmebaasi seadetes turvalisuse jaotise ja parooli uuesti määrama.</translation>
     </message>
     <message>
         <source>Retry with empty password</source>
@@ -1190,12 +1199,13 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
-        <translation type="unfinished"/>
+        <translation>Lisatunnused (kui vaja):</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Kasutada saab riistvaralist võtit nagu &lt;strong&gt;YubiKey&lt;/strong&gt; või &lt;strong&gt;OnlyKey&lt;/strong&gt;, millel on HMAC-SHA1 jaoks seadistatud pesa.&lt;/p&gt;
+&lt;p&gt;Lisateabe saamiseks klõpsa.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
@@ -1203,24 +1213,25 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
     </message>
     <message>
         <source>Key file help</source>
-        <translation type="unfinished"/>
+        <translation>Abi võtmefailide kohta</translation>
     </message>
     <message>
         <source>?</source>
-        <translation type="unfinished"/>
+        <translation>?</translation>
     </message>
     <message>
         <source>Select key file...</source>
-        <translation type="unfinished"/>
+        <translation>Vali võtmefail...</translation>
     </message>
     <message>
         <source>Cannot use database file as key file</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasifail ei sobi võtmefailiks</translation>
     </message>
     <message>
         <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasifaili ennast ei saa võtmefailina kasutada.
+Kui andmebaasi avamiseks pole võtmefaili vaja, jäta see väli tühjaks.</translation>
     </message>
 </context>
 <context>
@@ -1379,30 +1390,30 @@ This is necessary to maintain compatibility with the browser plugin.</source>
     </message>
     <message>
         <source>Remove selected key</source>
-        <translation type="unfinished"/>
+        <translation>Eemalda valitud võti</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
     <message>
         <source>Encryption Algorithm:</source>
-        <translation type="unfinished"/>
+        <translation>Krüptimisalgoritm:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
-        <translation type="unfinished"/>
+        <translation>AES: 256-bitine (vaikimisi)</translation>
     </message>
     <message>
         <source>Twofish:  256 Bit</source>
-        <translation type="unfinished"/>
+        <translation>Twofish: 256-bitine</translation>
     </message>
     <message>
         <source>Key Derivation Function:</source>
-        <translation type="unfinished"/>
+        <translation>Võtmetuletusfunktsioon:</translation>
     </message>
     <message>
         <source>Transform rounds:</source>
-        <translation type="unfinished"/>
+        <translation>Teisendusraundide arv:</translation>
     </message>
     <message>
         <source>Benchmark 1-second delay</source>
@@ -1414,7 +1425,7 @@ This is necessary to maintain compatibility with the browser plugin.</source>
     </message>
     <message>
         <source>Parallelism:</source>
-        <translation type="unfinished"/>
+        <translation>Rööpsus:</translation>
     </message>
     <message>
         <source>Decryption Time:</source>
@@ -1446,11 +1457,11 @@ This is necessary to maintain compatibility with the browser plugin.</source>
     </message>
     <message>
         <source>This is only important if you need to use your database with other programs.</source>
-        <translation type="unfinished"/>
+        <translation>See on oluline vaid juhul, kui andmebaasi on vaja kasutada ka teiste programmidega.</translation>
     </message>
     <message>
         <source>KDBX 4.0 (recommended)</source>
-        <translation>KDBX 4.0 (soovitatav)</translation>
+        <translation>KDBX 4.0 (soovituslik)</translation>
     </message>
     <message>
         <source>KDBX 3.1</source>
@@ -1464,17 +1475,19 @@ This is necessary to maintain compatibility with the browser plugin.</source>
     <message>
         <source>Number of rounds too high</source>
         <comment>Key transformation rounds</comment>
-        <translation type="unfinished"/>
+        <translation>Liiga suur raundide arv</translation>
     </message>
     <message>
         <source>You are using a very high number of key transform rounds with Argon2.
 
 If you keep this number, your database may take hours or days (or even longer) to open!</source>
-        <translation type="unfinished"/>
+        <translation>Määrasid väga suure Argon2 võtmeteisendusraundide arvu.
+
+Kui jätad selle väiksemaks muutmata, võib andmebaasi avamine võtta tunde või päevi – või veelgi kauem!</translation>
     </message>
     <message>
         <source>Understood, keep number</source>
-        <translation type="unfinished"/>
+        <translation>Jäta ikkagi muutmata</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -1483,13 +1496,15 @@ If you keep this number, your database may take hours or days (or even longer) t
     <message>
         <source>Number of rounds too low</source>
         <comment>Key transformation rounds</comment>
-        <translation type="unfinished"/>
+        <translation>Liiga väike raundide arv</translation>
     </message>
     <message>
         <source>You are using a very low number of key transform rounds with AES-KDF.
 
 If you keep this number, your database may be too easy to crack!</source>
-        <translation type="unfinished"/>
+        <translation>Määrasid väga väikse AES-KDF-i võtmeteisendusraundide arvu.
+
+Kui jätad selle suuremaks muutmata, võib andmebaasi olla lihtne lahti murda!</translation>
     </message>
     <message>
         <source>KDF unchanged</source>
@@ -1537,11 +1552,11 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Key derivation function</source>
-        <translation type="unfinished"/>
+        <translation>Võtmetuletusfunktsioon</translation>
     </message>
     <message>
         <source>Transform rounds</source>
-        <translation type="unfinished"/>
+        <translation>Teisendusraundide arv</translation>
     </message>
     <message>
         <source>Memory usage</source>
@@ -1549,7 +1564,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Parallelism</source>
-        <translation type="unfinished"/>
+        <translation>Rööpsus</translation>
     </message>
 </context>
 <context>
@@ -1692,15 +1707,15 @@ Seda toimingut ei saa tagasi võtta.</translation>
     </message>
     <message>
         <source>No encryption key added</source>
-        <translation type="unfinished"/>
+        <translation>Ühtki krüptimisvõtit pole lisatud</translation>
     </message>
     <message>
         <source>You must add at least one encryption key to secure your database!</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasi kaitsmiseks tuleb lisada vähemalt üks krüptimisvõti.</translation>
     </message>
     <message>
         <source>No password set</source>
-        <translation type="unfinished"/>
+        <translation>Parooli pole määratud</translation>
     </message>
     <message>
         <source>WARNING! You have not set a password. Using a database without a password is strongly discouraged!
@@ -1710,7 +1725,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Unknown error</source>
-        <translation type="unfinished"/>
+        <translation>Tundmatu viga</translation>
     </message>
     <message>
         <source>Failed to change master key</source>
@@ -1718,7 +1733,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Continue without password</source>
-        <translation type="unfinished"/>
+        <translation>Jätka ilma paroolita</translation>
     </message>
 </context>
 <context>
@@ -1748,7 +1763,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Hover over lines with error icons for further information.</source>
-        <translation type="unfinished"/>
+        <translation>Veaikooniga ridade kohta täpsema teabe saamiseks hoia hiirekursorit vastaval real.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1788,7 +1803,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>The database was modified, but the changes have not yet been saved to disk.</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasi on muudetud, kuid muudatused pole veel kettale salvestatud.</translation>
     </message>
     <message>
         <source>Number of groups</source>
@@ -1804,7 +1819,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>The database contains entries that have expired.</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaas sisaldab aegunud kirjeid.</translation>
     </message>
     <message>
         <source>Unique passwords</source>
@@ -1816,15 +1831,15 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>More than 10% of passwords are reused. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Rohkem kui 10% paroolidest on kasutatud korduvalt. Kui vähegi võimalik, kasuta ainukordseid paroole.</translation>
     </message>
     <message>
         <source>Maximum password reuse</source>
-        <translation type="unfinished"/>
+        <translation>Sagedasima parooli kasutuskordade arv</translation>
     </message>
     <message>
         <source>Some passwords are used more than three times. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Mõnda parooli on kasutatud enam kui kolm korda. Kui vähegi võimalik, kasuta ainukordseid paroole.</translation>
     </message>
     <message>
         <source>Number of short passwords</source>
@@ -1832,7 +1847,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Recommended minimum password length is at least 8 characters.</source>
-        <translation type="unfinished"/>
+        <translation>Paroolide soovituslik pikkus on vähemalt 8 märki.</translation>
     </message>
     <message>
         <source>Number of weak passwords</source>
@@ -1840,7 +1855,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Recommend using long, randomized passwords with a rating of &apos;good&apos; or &apos;excellent&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Soovitatav on kasutada pikki juhuslikest märkidest koosnevaid paroole, mille tugevushinnang on &quot;hea&quot; või &quot;suurepärane&quot;.</translation>
     </message>
     <message>
         <source>Average password length</source>
@@ -1852,11 +1867,11 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Average password length is less than ten characters. Longer passwords provide more security.</source>
-        <translation type="unfinished"/>
+        <translation>Paroolide keskmine pikkus on alla kümne märgi. Pikemad paroolid on turvalisemad.</translation>
     </message>
     <message>
         <source>Please wait, database statistics are being calculated...</source>
-        <translation type="unfinished"/>
+        <translation>Palun oota, andmebaasi statistikat arvutatakse...</translation>
     </message>
 </context>
 <context>
@@ -1931,7 +1946,7 @@ This is definitely a bug, please report it to the developers.</source>
     </message>
     <message>
         <source>Failed to open %1. It either does not exist or is not accessible.</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasi &quot;%1&quot; avamine ebaõnnestus. Faili pole kas enam olemas või puudub sellele juurdepääsuõigus.</translation>
     </message>
     <message>
         <source>Export database to HTML file</source>
@@ -1951,7 +1966,7 @@ This is definitely a bug, please report it to the developers.</source>
     </message>
     <message>
         <source>You are about to export your database to an unencrypted file. This will leave your passwords and sensitive information vulnerable! Are you sure you want to continue?</source>
-        <translation type="unfinished"/>
+        <translation>Asusid andmebaasi eksportima krüptimata failivormingusse. See jätab su paroolid jm tundliku teabe kaitseta! Kas oled kindel, et soovid jätkata?</translation>
     </message>
 </context>
 <context>
@@ -2047,21 +2062,23 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>You are editing an entry. Discard changes and lock anyway?</source>
-        <translation type="unfinished"/>
+        <translation>Kirje muutmine on pooleli. Kas unustada muudatused ja andmebaas ikkagi lukustada?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; was modified.
 Save changes?</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasi &quot;%1&quot; on muudetud.
+Kas salvestada muudatused?</translation>
     </message>
     <message>
         <source>Database was modified.
 Save changes?</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasi on muudetud.
+Kas salvestada muudatused?</translation>
     </message>
     <message>
         <source>Save changes?</source>
-        <translation type="unfinished"/>
+        <translation>Muudatuste salvestamine</translation>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload.
@@ -2170,7 +2187,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Select private key</source>
-        <translation type="unfinished"/>
+        <translation>Privaatvõtme valimine</translation>
     </message>
     <message>
         <source>File too large to be a private key</source>
@@ -2182,11 +2199,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Entry history</source>
-        <translation type="unfinished"/>
+        <translation>Kirje ajalugu</translation>
     </message>
     <message>
         <source>Add entry</source>
-        <translation type="unfinished"/>
+        <translation>Kirje lisamine</translation>
     </message>
     <message>
         <source>Edit entry</source>
@@ -2198,7 +2215,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>New attribute</source>
-        <translation type="unfinished"/>
+        <translation>Uus atribuut</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this attribute?</source>
@@ -2234,7 +2251,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>New attribute %1</source>
-        <translation type="unfinished"/>
+        <translation>Uus atribuut %1</translation>
     </message>
     <message>
         <source>[PROTECTED] Press reveal to view or edit</source>
@@ -2254,7 +2271,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>&lt;empty URL&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;tühi URL&gt;</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this URL?</source>
@@ -2372,7 +2389,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Custom Auto-Type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Omamääratud automaatsisestuse jada</translation>
     </message>
     <message>
         <source>Open Auto-Type help webpage</source>
@@ -2380,38 +2397,38 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Existing window associations</source>
-        <translation type="unfinished"/>
+        <translation>Juba määratud aknaseosed</translation>
     </message>
     <message>
         <source>Add new window association</source>
-        <translation type="unfinished"/>
+        <translation>Lisa uus aknaseos</translation>
     </message>
     <message>
         <source>Remove selected window association</source>
-        <translation type="unfinished"/>
+        <translation>Eemalda valitud aknaseos</translation>
     </message>
     <message>
         <source>You can use an asterisk (*) to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Suvalise märgijada vastavuse määramiseks saab kasutada tärni (*)</translation>
     </message>
     <message>
         <source>Set the window association title</source>
-        <translation type="unfinished"/>
+        <translation>Määra seostatava akna tiitel</translation>
     </message>
     <message>
         <source>You can use an asterisk to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Suvalise märgijada vastavuse määramiseks saab kasutada tärni</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence for this window</source>
-        <translation type="unfinished"/>
+        <translation>Omamääratud automaatsisestuse jada selle akna jaoks</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetBrowser</name>
     <message>
         <source>These settings affect to the entry&apos;s behaviour with the browser extension.</source>
-        <translation type="unfinished"/>
+        <translation>Need seaded mõjutavad kirje käitumist brauserilaiendusega.</translation>
     </message>
     <message>
         <source>General</source>
@@ -2423,11 +2440,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Hide this entry from the browser extension</source>
-        <translation type="unfinished"/>
+        <translation>See kirje peidetakse brauserilaienduse eest</translation>
     </message>
     <message>
         <source>Additional URL&apos;s</source>
-        <translation type="unfinished"/>
+        <translation>Lisa-URL-id</translation>
     </message>
     <message>
         <source>Add</source>
@@ -2439,7 +2456,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"/>
+        <translation>Muuda</translation>
     </message>
 </context>
 <context>
@@ -2462,23 +2479,23 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Entry history selection</source>
-        <translation type="unfinished"/>
+        <translation>Kirje ajaloolise seisu valimine</translation>
     </message>
     <message>
         <source>Show entry at selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Näita valitud ajaloolist seisu</translation>
     </message>
     <message>
         <source>Restore entry to selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Taasta valitud ajalooline seis</translation>
     </message>
     <message>
         <source>Delete selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Kustuta valitud ajalooline seis</translation>
     </message>
     <message>
         <source>Delete all history</source>
-        <translation type="unfinished"/>
+        <translation>Kustuta kogu selle kirje ajalugu</translation>
     </message>
 </context>
 <context>
@@ -2584,7 +2601,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Remove key from agent after</source>
-        <translation type="unfinished"/>
+        <translation>Võti eemaldatakse agendilt pärast</translation>
     </message>
     <message>
         <source> seconds</source>
@@ -2596,7 +2613,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
-        <translation type="unfinished"/>
+        <translation>Võti eemaldatakse agendilt andmebaasi sulgemisel/lukustamisel</translation>
     </message>
     <message>
         <source>Public key</source>
@@ -2604,7 +2621,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Add key to agent when database is opened/unlocked</source>
-        <translation type="unfinished"/>
+        <translation>Võti lisatakse agendile andmebaasi avamisel / lukust lahti tegemisel</translation>
     </message>
     <message>
         <source>Comment</source>
@@ -2649,7 +2666,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Require user confirmation when this key is used</source>
-        <translation type="unfinished"/>
+        <translation>Võtme kasutamisel küsitakse kasutajalt kinnitust</translation>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
@@ -3104,7 +3121,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Save attachments</source>
-        <translation type="unfinished"/>
+        <translation>Kaasatud failide salvestamine</translation>
     </message>
     <message>
         <source>Unable to create directory:
@@ -3122,17 +3139,20 @@ This may cause the affected plugins to malfunction.</source>
     <message>
         <source>Unable to save attachments:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Kaasatud failide salvestamine pole võimalik:
+%1</translation>
     </message>
     <message>
         <source>Unable to open attachment:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Kaasatud faili avamine pole võimalik:
+%1</translation>
     </message>
     <message>
         <source>Unable to open attachments:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Kaasatud failide avamine pole võimalik:
+%1</translation>
     </message>
     <message>
         <source>Confirm remove</source>
@@ -3358,11 +3378,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Hide Usernames</source>
-        <translation>Kasutajanimed peidetud</translation>
+        <translation>Kasutajanimede varjamine</translation>
     </message>
     <message>
         <source>Hide Passwords</source>
-        <translation>Paroolid peidetud</translation>
+        <translation>Paroolide varjamine</translation>
     </message>
     <message>
         <source>Fit to window</source>
@@ -3430,7 +3450,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation type="unfinished"/>
+        <translation>Saidiikoonide allalaadimine</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -3455,11 +3475,11 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Please wait, processing entry list...</source>
-        <translation type="unfinished"/>
+        <translation>Palun oota, kirjete nimekirja töödeldakse...</translation>
     </message>
     <message>
         <source>Downloading...</source>
-        <translation type="unfinished"/>
+        <translation>Allalaadimine...</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -3467,15 +3487,15 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Already Exists</source>
-        <translation type="unfinished"/>
+        <translation>On juba olemas</translation>
     </message>
     <message>
         <source>Download Failed</source>
-        <translation type="unfinished"/>
+        <translation>Allalaadimine ebaõnnestus</translation>
     </message>
     <message>
         <source>Downloading favicons (%1/%2)...</source>
-        <translation type="unfinished"/>
+        <translation>Saidiikoonide allalaadimine (%1/%2)...</translation>
     </message>
 </context>
 <context>
@@ -3486,38 +3506,38 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Close message</source>
-        <translation type="unfinished"/>
+        <translation>Sulge teade</translation>
     </message>
 </context>
 <context>
     <name>Kdbx3Reader</name>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>ülemvõtme arvutamine pole võimalik.</translation>
     </message>
     <message>
         <source>Unable to issue challenge-response.</source>
-        <translation type="unfinished"/>
+        <translation>pretensiooni ja vastuse väljastamine pole võimalik.</translation>
     </message>
     <message>
         <source>missing database headers</source>
-        <translation type="unfinished"/>
+        <translation>andmebaasipäised on puudu.</translation>
     </message>
     <message>
         <source>Header doesn&apos;t match hash</source>
-        <translation type="unfinished"/>
+        <translation>päis ei vasta räsile.</translation>
     </message>
     <message>
         <source>Invalid header id size</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu päise-ID suurus</translation>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu päisevälja suurus</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu päiseandmete pikkus</translation>
     </message>
     <message>
         <source>Invalid credentials were provided, please try again.
@@ -3530,46 +3550,46 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
     <name>Kdbx3Writer</name>
     <message>
         <source>Unable to issue challenge-response.</source>
-        <translation type="unfinished"/>
+        <translation>pretensiooni ja vastuse väljastamine pole võimalik.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>ülemvõtme arvutamine pole võimalik.</translation>
     </message>
 </context>
 <context>
     <name>Kdbx4Reader</name>
     <message>
         <source>missing database headers</source>
-        <translation type="unfinished"/>
+        <translation>andmebaasipäised on puudu.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>ülemvõtme arvutamine pole võimalik.</translation>
     </message>
     <message>
         <source>Invalid header checksum size</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu päise kontrollsumma suurus</translation>
     </message>
     <message>
         <source>Header SHA256 mismatch</source>
-        <translation type="unfinished"/>
+        <translation>päise SHA256 mittevastavus</translation>
     </message>
     <message>
         <source>Unknown cipher</source>
-        <translation type="unfinished"/>
+        <translation>tundmatu šiffer</translation>
     </message>
     <message>
         <source>Invalid header id size</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu päise-ID suurus</translation>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu päisevälja suurus</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu päiseandmete pikkus</translation>
     </message>
     <message>
         <source>Failed to open buffer for KDF parameters in header</source>
@@ -3581,15 +3601,15 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
     </message>
     <message>
         <source>Legacy header fields found in KDBX4 file.</source>
-        <translation type="unfinished"/>
+        <translation>KDBX4-failist leiti iganenud päisevälju.</translation>
     </message>
     <message>
         <source>Invalid inner header id size</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu sisemine päise-ID suurus</translation>
     </message>
     <message>
         <source>Invalid inner header field length</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu sisemine päisevälja suurus</translation>
     </message>
     <message>
         <source>Invalid inner header binary size</source>
@@ -3679,7 +3699,7 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>ülemvõtme arvutamine pole võimalik.</translation>
     </message>
     <message>
         <source>Failed to serialize KDF parameters variant map</source>
@@ -3691,7 +3711,7 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
     <name>KdbxReader</name>
     <message>
         <source>Unsupported cipher</source>
-        <translation type="unfinished"/>
+        <translation>toetamata šiffer</translation>
     </message>
     <message>
         <source>Invalid compression flags length</source>
@@ -3699,7 +3719,7 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
     </message>
     <message>
         <source>Unsupported compression algorithm</source>
-        <translation type="unfinished"/>
+        <translation>toetamata pakkimisalgoritm</translation>
     </message>
     <message>
         <source>Invalid master seed size</source>
@@ -3727,7 +3747,7 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation type="unfinished"/>
+        <translation>tegemist pole KeePassi andmebaasiga.</translation>
     </message>
     <message>
         <source>The selected file is an old KeePass 1 database (.kdb).
@@ -3738,7 +3758,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Unsupported KeePass 2 database version.</source>
-        <translation type="unfinished"/>
+        <translation>toetamata KeePass 2 andmebaasiversioon</translation>
     </message>
     <message>
         <source>Invalid cipher uuid length: %1 (length=%2)</source>
@@ -3761,7 +3781,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>No root group</source>
-        <translation type="unfinished"/>
+        <translation>juurgrupp puudub</translation>
     </message>
     <message>
         <source>Missing icon uuid or data</source>
@@ -3845,15 +3865,15 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Invalid bool value</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu tõeväärtus</translation>
     </message>
     <message>
         <source>Invalid date time value</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu ajaväärtus</translation>
     </message>
     <message>
         <source>Invalid color value</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu värviväärtus</translation>
     </message>
     <message>
         <source>Invalid color rgb part</source>
@@ -3861,11 +3881,11 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Invalid number value</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu arvväärtus</translation>
     </message>
     <message>
         <source>Invalid uuid value</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu UUID-väärtus</translation>
     </message>
     <message>
         <source>Unable to decompress binary</source>
@@ -3876,7 +3896,9 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>XML error:
 %1
 Line %2, column %3</source>
-        <translation type="unfinished"/>
+        <translation>XML-i viga:
+%1
+Rida %2, veerg %3</translation>
     </message>
 </context>
 <context>
@@ -3898,15 +3920,15 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation type="unfinished"/>
+        <translation>tegemist pole KeePassi andmebaasiga.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
-        <translation type="unfinished"/>
+        <translation>toetamata krüptimisalgoritm</translation>
     </message>
     <message>
         <source>Unsupported KeePass database version.</source>
-        <translation type="unfinished"/>
+        <translation>toetamata KeePassi andmebaasiversioon</translation>
     </message>
     <message>
         <source>Unable to read encryption IV</source>
@@ -3915,11 +3937,11 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Invalid number of groups</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu gruppide arv</translation>
     </message>
     <message>
         <source>Invalid number of entries</source>
-        <translation type="unfinished"/>
+        <translation>sobimatu kirjete arv</translation>
     </message>
     <message>
         <source>Invalid content hash size</source>
@@ -3943,7 +3965,7 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>ülemvõtme arvutamine pole võimalik.</translation>
     </message>
     <message>
         <source>Key transformation failed</source>
@@ -4146,7 +4168,7 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Lisaturvalisuse saavutamiseks võid määrata juhuslikke baite sisaldava võtmefaili.&lt;/p&gt;&lt;p&gt;Hoia seda salajas ja ära seda ära kaota, sest muidu ei saa andmebaasi lukku enam avada!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
@@ -4162,7 +4184,8 @@ Please go to the master key settings and generate a new key file.</source>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
-        <translation type="unfinished"/>
+        <translation>Viga võtmefaili &quot;%1&quot; laadimisel.
+Teade: %2</translation>
     </message>
     <message>
         <source>Key files</source>
@@ -4174,27 +4197,27 @@ Message: %2</source>
     </message>
     <message>
         <source>Create Key File...</source>
-        <translation type="unfinished"/>
+        <translation>Võtmefaili loomine</translation>
     </message>
     <message>
         <source>Error creating key file</source>
-        <translation type="unfinished"/>
+        <translation>Viga võtmefaili loomisel</translation>
     </message>
     <message>
         <source>Unable to create key file: %1</source>
-        <translation type="unfinished"/>
+        <translation>Võtmefaili pole võimalk luua: %1</translation>
     </message>
     <message>
         <source>Select a key file</source>
-        <translation type="unfinished"/>
+        <translation>Võtmefaili valimine</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Võtmefaili valimine</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Vali võtmefail</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -4202,28 +4225,29 @@ Message: %2</source>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation type="unfinished"/>
+        <translation>Genereeri uus võtmefail</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
+        <translation>NB: ära kasuta faili, mis võib muutuda, kuna sel juhul pole enam võimalik andmebaasi lukku avada!</translation>
     </message>
     <message>
         <source>Invalid Key File</source>
-        <translation type="unfinished"/>
+        <translation>Sobimatu võtmefail</translation>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaasi ennast ei saa võtmefailina kasutada. Palun vali mõni muu fail või genereeri uus võtmefail.</translation>
     </message>
     <message>
         <source>Suspicious Key File</source>
-        <translation type="unfinished"/>
+        <translation>Kahtlane võtmefail</translation>
     </message>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation type="unfinished"/>
+        <translation>Valitud võtmefail näeb välja nagu parooliandmebaasifail. Võtmefail ei tohi kunagi muutuda, sest muidu kaotad igaveseks oma andmebaasile ligipääsu.
+Kas oled kindel, et soovid selle failiga jätkata?</translation>
     </message>
 </context>
 <context>
@@ -4672,7 +4696,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation type="unfinished"/>
+        <translation>Siin saab määrata andmebaasi krüptimisseaded. Hiljem saab neid muuta andmebaasi seadetes.</translation>
     </message>
     <message>
         <source>Advanced Settings</source>
@@ -4691,7 +4715,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation type="unfinished"/>
+        <translation>Siin saab määrata andmebaasi krüptimisseaded. Hiljem saab neid muuta andmebaasi seadetes.</translation>
     </message>
 </context>
 <context>
@@ -4702,7 +4726,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>A master key known only to you protects your database.</source>
-        <translation type="unfinished"/>
+        <translation>Kaitse andmebaasi ülemvõtmega, mida ainult sina tead.</translation>
     </message>
 </context>
 <context>
@@ -4908,7 +4932,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>&lt;p&gt;A password is the primary method for securing your database.&lt;/p&gt;&lt;p&gt;Good passwords are long and unique. KeePassXC can generate one for you.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Parool on esmane meetod andmebaasi turvamiseks.&lt;/p&gt;&lt;p&gt;Hea parool on pikk ja ainukordne. Soovi korral võib lasta KeePassXC-l parooli genereerida.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Passwords do not match.</source>
@@ -4948,11 +4972,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <message>
         <source>strength</source>
         <comment>Password strength</comment>
-        <translation type="unfinished"/>
+        <translation>tugevus</translation>
     </message>
     <message>
         <source>entropy</source>
-        <translation type="unfinished"/>
+        <translation>entroopia</translation>
     </message>
     <message>
         <source>Password</source>
@@ -5092,7 +5116,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Logograms</source>
-        <translation type="unfinished"/>
+        <translation>Logogrammid</translation>
     </message>
     <message>
         <source>#$%&amp;&amp;@^`~</source>
@@ -5108,7 +5132,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Character set to exclude from generated password</source>
-        <translation type="unfinished"/>
+        <translation>Märgid, mida genereeritavas paroolis esineda ei tohi</translation>
     </message>
     <message>
         <source>Do not include:</source>
@@ -5136,7 +5160,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Generated password</source>
-        <translation type="unfinished"/>
+        <translation>Genereeritud parool</translation>
     </message>
     <message>
         <source>Upper-case letters</source>
@@ -5168,7 +5192,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Password length</source>
-        <translation type="unfinished"/>
+        <translation>Parooli pikkus</translation>
     </message>
     <message>
         <source>Word Case:</source>
@@ -5301,7 +5325,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Unknown error</source>
-        <translation type="unfinished"/>
+        <translation>Tundmatu viga</translation>
     </message>
     <message>
         <source>Add a new entry to a database.</source>
@@ -5471,11 +5495,11 @@ Võimalikud käsud:
     </message>
     <message>
         <source>malformed string</source>
-        <translation type="unfinished"/>
+        <translation>vigane string</translation>
     </message>
     <message>
         <source>missing closing quote</source>
-        <translation type="unfinished"/>
+        <translation>puuduv lõpujutumärk</translation>
     </message>
     <message>
         <source>Group</source>
@@ -5810,27 +5834,27 @@ Võimalikud käsud:
     </message>
     <message>
         <source>AES: 256-bit</source>
-        <translation type="unfinished"/>
+        <translation>AES: 256-bitine</translation>
     </message>
     <message>
         <source>Twofish: 256-bit</source>
-        <translation type="unfinished"/>
+        <translation>Twofish: 256-bitine</translation>
     </message>
     <message>
         <source>ChaCha20: 256-bit</source>
-        <translation type="unfinished"/>
+        <translation>ChaCha20: 256-bitine</translation>
     </message>
     <message>
         <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation type="unfinished"/>
+        <translation>Argon2 (KDBX 4 – soovituslik)</translation>
     </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
-        <translation type="unfinished"/>
+        <translation>AES-KDF (KDBX 4)</translation>
     </message>
     <message>
         <source>AES-KDF (KDBX 3.1)</source>
-        <translation type="unfinished"/>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Invalid Settings</source>
@@ -5896,7 +5920,7 @@ Võimalikud käsud:
     </message>
     <message>
         <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - mitmeplatvormne paroolihaldur</translation>
+        <translation>KeePassXC – mitmeplatvormne paroolihaldur</translation>
     </message>
     <message>
         <source>filenames of the password databases to open (*.kdbx)</source>
@@ -5928,7 +5952,7 @@ Võimalikud käsud:
     </message>
     <message>
         <source>KeePassXC - Error</source>
-        <translation>Viga - KeePassXC</translation>
+        <translation>Viga – KeePassXC</translation>
     </message>
     <message>
         <source>Database password: </source>
@@ -6348,23 +6372,23 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Every search term must match (ie, logical AND)</source>
-        <translation type="unfinished"/>
+        <translation>Tagastatakse kirjed, mis vastavad kõigile otsingusõnadele (s.t tegu on loogilise JA-tehtega)</translation>
     </message>
     <message>
         <source>Modifiers</source>
-        <translation type="unfinished"/>
+        <translation>Modifikaatorid</translation>
     </message>
     <message>
         <source>exclude term from results</source>
-        <translation type="unfinished"/>
+        <translation>välja arvatud otsingusõna</translation>
     </message>
     <message>
         <source>match term exactly</source>
-        <translation type="unfinished"/>
+        <translation>otsingusõna täpne sobivus</translation>
     </message>
     <message>
         <source>use regex in term</source>
-        <translation type="unfinished"/>
+        <translation>otsingusõna on regulaaravaldis</translation>
     </message>
     <message>
         <source>Fields</source>
@@ -6376,11 +6400,11 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>match anything</source>
-        <translation type="unfinished"/>
+        <translation>suvaline märgijada</translation>
     </message>
     <message>
         <source>match one</source>
-        <translation type="unfinished"/>
+        <translation>suvaline üks märk</translation>
     </message>
     <message>
         <source>logical OR</source>
@@ -6395,7 +6419,7 @@ Kernel: %3 %4</translation>
     <name>SearchWidget</name>
     <message>
         <source>Search</source>
-        <translation>Otsimine</translation>
+        <translation>Otsinguseaded</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -6435,19 +6459,19 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Show notification when credentials are requested</source>
-        <translation type="unfinished"/>
+        <translation>Tunnuste taotlemisel kuvatakse märguanne</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kui andmebaasi prügikast on sisse lülitatud, teisaldatakse kirjed sinna, muul juhul kustutatakse kohe lõplikult.&lt;/p&gt;&lt;p&gt;Kui kustutatavale kirjele viitab mõni teine kirje, küsitakse siiski kinnitust ka siis, kui see märkeruut on märgitud.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation type="unfinished"/>
+        <translation>Klientidel lubatakse kirjeid kinnituseta kustutada</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
-        <translation>Nähtavaks tehtud andmebaasigrupid:</translation>
+        <translation>Nähtavaks tehtud grupid andmebaasides:</translation>
     </message>
     <message>
         <source>File Name</source>
@@ -6483,7 +6507,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Edit database settings</source>
-        <translation type="unfinished"/>
+        <translation>Muuda andmebaasi seadeid</translation>
     </message>
     <message>
         <source>Unlock database</source>
@@ -6491,7 +6515,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Unlock database to show more information</source>
-        <translation type="unfinished"/>
+        <translation>Lisateabe nägemiseks ava andmebaasi lukk</translation>
     </message>
     <message>
         <source>Lock database</source>
@@ -6499,7 +6523,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Unlock to show</source>
-        <translation type="unfinished"/>
+        <translation>Nägemiseks ava lukk</translation>
     </message>
     <message>
         <source>None</source>
@@ -7002,39 +7026,39 @@ Example: JBSWY3DPEHPK3PXP</source>
     <name>WelcomeWidget</name>
     <message>
         <source>Start storing your passwords securely in a KeePassXC database</source>
-        <translation type="unfinished"/>
+        <translation>Hakka oma paroole turvaliselt KeePassXC andmebaasis hoidma</translation>
     </message>
     <message>
         <source>Create new database</source>
-        <translation type="unfinished"/>
+        <translation>Loo uus andmebaas</translation>
     </message>
     <message>
         <source>Open existing database</source>
-        <translation type="unfinished"/>
+        <translation>Ava olemasolev andmebaas</translation>
     </message>
     <message>
         <source>Import from KeePass 1</source>
-        <translation type="unfinished"/>
+        <translation>Impordi KeePass 1-st</translation>
     </message>
     <message>
         <source>Import from CSV</source>
-        <translation type="unfinished"/>
+        <translation>Impordi CSV-failist</translation>
     </message>
     <message>
         <source>Recent databases</source>
-        <translation type="unfinished"/>
+        <translation>Viimatised andmebaasid</translation>
     </message>
     <message>
         <source>Welcome to KeePassXC %1</source>
-        <translation type="unfinished"/>
+        <translation>Tere tulemast KeePassXC %1 kasutama!</translation>
     </message>
     <message>
         <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Impordi 1Passwordist</translation>
     </message>
     <message>
         <source>Open a recent database</source>
-        <translation type="unfinished"/>
+        <translation>Ava hiljutine andmebaas</translation>
     </message>
 </context>
 <context>
@@ -7049,23 +7073,23 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>&lt;p&gt;If you own a &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, you can use it for additional security.&lt;/p&gt;&lt;p&gt;The YubiKey requires one of its slots to be programmed as &lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;HMAC-SHA1 Challenge-Response&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Kui sul on &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, võid lisaturvalisuse nimel seda kasutada.&lt;/p&gt;&lt;p&gt;Ühe YubiKey pesa peab programmeerima &lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;HMAC-SHA1 pretensiooni ja vastusena&lt;/a&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
-        <translation type="unfinished"/>
+        <translation>YubiKey&apos;d ei tuvastatud. Vaata, et see oleks ühendatud.</translation>
     </message>
     <message>
         <source>No YubiKey inserted.</source>
-        <translation type="unfinished"/>
+        <translation>YubiKey&apos;d pole sisestatud.</translation>
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Värskenda riistvaraliste võtmete loendit</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Riistvaralise võtme pesa valimine</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_ja.ts b/share/translations/keepassx_ja.ts
index 7158f0e657..0737f1c5da 100644
--- a/share/translations/keepassx_ja.ts
+++ b/share/translations/keepassx_ja.ts
@@ -6199,7 +6199,7 @@ CPU アーキテクチャー: %2
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
-        <translation type="unfinished"/>
+        <translation>XMLデータベース %1 をインポートできません</translation>
     </message>
     <message>
         <source>Successfully imported database.</source>
diff --git a/share/translations/keepassx_ko.ts b/share/translations/keepassx_ko.ts
index 5b925ec3e0..29a0c725fa 100644
--- a/share/translations/keepassx_ko.ts
+++ b/share/translations/keepassx_ko.ts
@@ -450,7 +450,7 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>항목별 자동 입력을 사용하려면 KeePassXC에 접근성 권한을 허용해야 합니다. 권한을 이미 허용했다면 KeePassXC를 다시 시작해 보십시오.</translation>
     </message>
 </context>
 <context>
@@ -506,7 +506,7 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>항목별 자동 입력을 사용하려면 KeePassXC에 접근성 및 화면 녹화 권한을 허용해야 합니다. 화면 녹화 권한은 창 제목과 항목을 찾기 위해서 필요합니다. 권한을 이미 허용했다면 KeePassXC를 다시 시작해 보십시오.</translation>
     </message>
 </context>
 <context>
@@ -878,7 +878,11 @@ Would you like to migrate your existing settings now?</source>
 
 Give the connection a unique name or ID, for example:
 chrome-laptop.</source>
-        <translation type="unfinished"/>
+        <translation>다음 데이터베이스 연결 요청을 받았습니다:
+%1
+
+데이터베이스 연결을 식별할 수 있는 이름이나 ID를 입력하십시오. 예:
+chrome-laptop.</translation>
     </message>
 </context>
 <context>
@@ -1211,11 +1215,12 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;&lt;strong&gt;YubiKey&lt;/strong&gt;나 &lt;strong&gt;OnlyKey&lt;/strong&gt;와 같은 하드웨어 키의 슬롯을 HMAC-SHA1로 설정 시 사용할 수 있습니다.&lt;/p&gt;
+&lt;p&gt;더 많은 정보를 보려면 누르십시오...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;데이터베이스 보안 향상을 위하여 마스터 암호 외에도 비밀 파일을 사용할 수 있습니다. 데이터베이스 보안 설정에서 비밀 파일을 생성할 수 있습니다.&lt;/p&gt;&lt;p&gt;이 파일은 *.kdbx 데이터베이스 파일이 &lt;strong&gt;아닙니다!&lt;/strong&gt;&lt;br&gt;만약 키 파일이 없다면 이 필드를 비워 두십시오.&lt;/p&gt;&lt;p&gt;더 많은 정보를 보려면 누르십시오...&lt;/p&gt; </translation>
     </message>
     <message>
         <source>Key file help</source>
@@ -1881,7 +1886,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Please wait, database statistics are being calculated...</source>
-        <translation type="unfinished"/>
+        <translation>데이터베이스 통계를 계산하는 동안 잠시 기다려 주십시오...</translation>
     </message>
 </context>
 <context>
@@ -6322,7 +6327,7 @@ CPU 아키텍처: %2
     </message>
     <message>
         <source>Show the protected attributes in clear text.</source>
-        <translation type="unfinished"/>
+        <translation>보호된 속성을 평문으로 표시합니다.</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/keepassx_nb.ts b/share/translations/keepassx_nb.ts
index 43123408a3..0af6622cb9 100644
--- a/share/translations/keepassx_nb.ts
+++ b/share/translations/keepassx_nb.ts
@@ -35,7 +35,7 @@
     </message>
     <message>
         <source>Copy to clipboard</source>
-        <translation>Kopier til utklippstavla</translation>
+        <translation>Kopier til utklippstavle</translation>
     </message>
     <message>
         <source>Project Maintainers:</source>
@@ -97,11 +97,11 @@
     </message>
     <message>
         <source>Reset Settings?</source>
-        <translation type="unfinished"/>
+        <translation>Tilbakestill innstillinger?</translation>
     </message>
     <message>
         <source>Are you sure you want to reset all general and security settings to default?</source>
-        <translation type="unfinished"/>
+        <translation>Er du sikker på at du vil tilbakestille alle generelle og sikkerhetsinnstillinger til standard?</translation>
     </message>
 </context>
 <context>
@@ -249,7 +249,7 @@
     </message>
     <message>
         <source>Language:</source>
-        <translation type="unfinished"/>
+        <translation>Språk:</translation>
     </message>
     <message>
         <source>(restart program to activate)</source>
@@ -269,7 +269,7 @@
     </message>
     <message>
         <source>Minimize</source>
-        <translation type="unfinished"/>
+        <translation>Minimer</translation>
     </message>
     <message>
         <source>Drop to background</source>
@@ -298,7 +298,7 @@
     </message>
     <message>
         <source>Language selection</source>
-        <translation type="unfinished"/>
+        <translation>Valg av språk</translation>
     </message>
     <message>
         <source>Reset Settings to Default</source>
@@ -411,7 +411,7 @@
     </message>
     <message>
         <source>Clear search query after</source>
-        <translation type="unfinished"/>
+        <translation>Tøm søket etter</translation>
     </message>
 </context>
 <context>
@@ -446,7 +446,7 @@
     </message>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Tillatelse kreves</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
@@ -502,7 +502,7 @@
     <name>AutoTypePlatformMac</name>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Tillatelse kreves</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
@@ -550,7 +550,7 @@ Velg om du vil gi tilgang eller ikke.</translation>
     </message>
     <message>
         <source>Allow access</source>
-        <translation type="unfinished"/>
+        <translation>Gi tilgang</translation>
     </message>
     <message>
         <source>Deny access</source>
@@ -743,7 +743,7 @@ Vennligst velg riktig database for å lagre legitimasjon.</translation>
     </message>
     <message>
         <source>&amp;Brave</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Brave</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
@@ -1124,15 +1124,15 @@ Vurder å opprette en ny nøkkelfil.</translation>
     </message>
     <message>
         <source>Unlock KeePassXC Database</source>
-        <translation type="unfinished"/>
+        <translation>Låse opp KeePassXC Database</translation>
     </message>
     <message>
         <source>Enter Password:</source>
-        <translation type="unfinished"/>
+        <translation>Oppgi passord:</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Passord felt</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
@@ -1191,7 +1191,7 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
     </message>
     <message>
         <source>Retry with empty password</source>
-        <translation type="unfinished"/>
+        <translation>Prøv igjen med tomt passord</translation>
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
@@ -1726,7 +1726,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
     </message>
     <message>
         <source>Continue without password</source>
-        <translation type="unfinished"/>
+        <translation>Fortsett uten passord</translation>
     </message>
 </context>
 <context>
@@ -2550,7 +2550,7 @@ Deaktivere sikker lagring og prøve igjen?</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Passord felt</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
@@ -2826,7 +2826,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Passord felt</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
@@ -4555,7 +4555,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Passord generator</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4906,7 +4906,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <name>PasswordEdit</name>
     <message>
         <source>Passwords do not match</source>
-        <translation type="unfinished"/>
+        <translation>Passordene er ikke like</translation>
     </message>
     <message>
         <source>Passwords match so far</source>
@@ -4941,7 +4941,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Passord felt</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
@@ -6248,7 +6248,7 @@ Kjerne: %3 %4</translation>
     </message>
     <message>
         <source>Enter password to unlock %1: </source>
-        <translation type="unfinished"/>
+        <translation>Skriv inn passord for å låse opp %1:</translation>
     </message>
     <message>
         <source>Invalid YubiKey slot %1</source>
diff --git a/share/translations/keepassx_pt_BR.ts b/share/translations/keepassx_pt_BR.ts
index 4e5b1349e1..0c53862fa1 100644
--- a/share/translations/keepassx_pt_BR.ts
+++ b/share/translations/keepassx_pt_BR.ts
@@ -77,7 +77,7 @@
     </message>
     <message>
         <source>Icon only</source>
-        <translation>Só Ícones</translation>
+        <translation>Só ícones</translation>
     </message>
     <message>
         <source>Text only</source>
@@ -124,11 +124,11 @@
     </message>
     <message>
         <source>File Management</source>
-        <translation>Gerenciamento de Arquivo</translation>
+        <translation>Gerenciamento de arquivo</translation>
     </message>
     <message>
         <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Salvar seguramente os arquivos de banco de dados (pode ser incompatível com o Dropbox, etc)</translation>
+        <translation>Salvar os arquivos de banco de dados com segurança (pode ser incompatível com o Dropbox, etc)</translation>
     </message>
     <message>
         <source>Backup database file before saving</source>
@@ -156,7 +156,7 @@
     </message>
     <message>
         <source>Use group icon on entry creation</source>
-        <translation>Usar ícone de grupo na criação da entrada</translation>
+        <translation>Usar ícone do grupo na criação da entrada</translation>
     </message>
     <message>
         <source>Hide the entry preview panel</source>
@@ -176,19 +176,19 @@
     </message>
     <message>
         <source>Show a system tray icon</source>
-        <translation>Mostrar um ícone da bandeja do sistema</translation>
+        <translation>Mostrar um ícone de bandeja do sistema</translation>
     </message>
     <message>
         <source>Dark system tray icon</source>
-        <translation>Ícone de bandeja do sistema escuro</translation>
+        <translation>Ícone de bandeja para sistema em modo escuro (dark mode)</translation>
     </message>
     <message>
         <source>Hide window to system tray when minimized</source>
-        <translation>Ocultar janela na bandeja de sistema quando minimizada</translation>
+        <translation>Ocultar janela para bandeja de sistema quando minimizada</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Autodigitação</translation>
+        <translation>Auto-Digitar</translation>
     </message>
     <message>
         <source>Use entry title to match windows for global Auto-Type</source>
@@ -204,7 +204,7 @@
     </message>
     <message>
         <source>Global Auto-Type shortcut</source>
-        <translation>Atalho para Auto-Digitação Global</translation>
+        <translation>Atalho para Auto-Digitar global</translation>
     </message>
     <message>
         <source>Auto-Type typing delay</source>
@@ -221,7 +221,7 @@
     </message>
     <message>
         <source>Movable toolbar</source>
-        <translation>Barra de Ferramentas Móvel</translation>
+        <translation>Barra de ferramentas móvel</translation>
     </message>
     <message>
         <source>Remember previously used databases</source>
@@ -233,15 +233,15 @@
     </message>
     <message>
         <source>Remember database key files and security dongles</source>
-        <translation>Lembre-se do arquivo-chave e dongles de segurança do banco de dados</translation>
+        <translation>Lembrar do arquivo-chave e dongles de segurança do banco de dados</translation>
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
-        <translation>Verificar atualizações na inicialização do aplicativo uma vez por semana</translation>
+        <translation>Verificar por atualizações na inicialização do aplicativo uma vez por semana</translation>
     </message>
     <message>
         <source>Include beta releases when checking for updates</source>
-        <translation>Incluem versões betas durante a verificação de atualizações</translation>
+        <translation>Incluir versões betas durante a verificação de atualizações</translation>
     </message>
     <message>
         <source>Button style:</source>
@@ -253,11 +253,11 @@
     </message>
     <message>
         <source>(restart program to activate)</source>
-        <translation>(reiniciar programa ao ativar)</translation>
+        <translation>(reiniciar programa para ativar)</translation>
     </message>
     <message>
         <source>Minimize window after unlocking database</source>
-        <translation>Minimizar a janela após desbloquear banco de dados</translation>
+        <translation>Minimizar a janela após destrancar banco de dados</translation>
     </message>
     <message>
         <source>Minimize when opening a URL</source>
@@ -273,7 +273,7 @@
     </message>
     <message>
         <source>Drop to background</source>
-        <translation>Soltar no fundo</translation>
+        <translation>Enviar para trás</translation>
     </message>
     <message>
         <source>Favicon download timeout:</source>
@@ -281,7 +281,7 @@
     </message>
     <message>
         <source>Website icon download timeout in seconds</source>
-        <translation>Esgotamento do download de ícone do website em segundos</translation>
+        <translation>Esgotamento de tempo do download de ícone do website em segundos</translation>
     </message>
     <message>
         <source> sec</source>
@@ -302,11 +302,11 @@
     </message>
     <message>
         <source>Reset Settings to Default</source>
-        <translation>Restaurar Configurações para o Padrão</translation>
+        <translation>Restaurar configurações para o padrão</translation>
     </message>
     <message>
         <source>Global auto-type shortcut</source>
-        <translation>Atalho global para Auto-Digitar</translation>
+        <translation>Atalho para Auto-Digitar global</translation>
     </message>
     <message>
         <source>Auto-type character typing delay milliseconds</source>
@@ -334,7 +334,7 @@
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation>Travar bancos de dados após inatividade de</translation>
+        <translation>Trancar bancos de dados após inatividade de</translation>
     </message>
     <message>
         <source> min</source>
@@ -350,19 +350,19 @@
     </message>
     <message>
         <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Bloqueio de bancos de dados quando a sessão estiver bloqueada ou a tampa está fechada</translation>
+        <translation>Trancar banco de dados quando a sessão for bloqueada ou a tela for fechada</translation>
     </message>
     <message>
         <source>Forget TouchID when session is locked or lid is closed</source>
-        <translation>Esqueça o TouchID quando a sessão está bloqueada ou a tampa está fechada</translation>
+        <translation>Esquecer TouchID quando a sessão for bloqueada ou a tela for fechada</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
-        <translation>Bloquear bancos de dados após minimizar a janela</translation>
+        <translation>Trancar bancos de dados após minimizar a janela</translation>
     </message>
     <message>
         <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Bloquear novamente o banco de dados anteriormente bloqueado depois de executar o Auto-Digitar</translation>
+        <translation>Trancar novamente o banco de dados anteriormente trancado depois de executar o Auto-Digitar</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
@@ -370,15 +370,15 @@
     </message>
     <message>
         <source>Don&apos;t hide passwords when editing them</source>
-        <translation>Não ocultar senhas quando estiver editando elas</translation>
+        <translation>Não ocultar senhas enquanto as estiver editando</translation>
     </message>
     <message>
         <source>Don&apos;t use placeholder for empty password fields</source>
-        <translation>Não use espaço reservado para campos de senha vazios</translation>
+        <translation>Não use preenchimento para campos de senha vazios</translation>
     </message>
     <message>
         <source>Hide passwords in the entry preview panel</source>
-        <translation>Ocultar senhas no painel da prévia de entrada</translation>
+        <translation>Ocultar senhas no painel de prévia de entrada</translation>
     </message>
     <message>
         <source>Hide entry notes by default</source>
@@ -398,11 +398,11 @@
     </message>
     <message>
         <source>Touch ID inactivity reset</source>
-        <translation>Reiniciar a initividade do Touch ID</translation>
+        <translation>Redefinição de inatividade do Touch ID</translation>
     </message>
     <message>
         <source>Database lock timeout seconds</source>
-        <translation>Tempo limite em segundos de bloqueio do banco de dados</translation>
+        <translation>Tempo limite em segundos para trancar o banco de dados</translation>
     </message>
     <message>
         <source> min</source>
@@ -422,27 +422,27 @@
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Autodigitação - KeePassXC</translation>
+        <translation>Auto-Digitar - KeePassXC</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Autodigitação</translation>
+        <translation>Auto-Digitar</translation>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation>A sintaxe da sua sequência de autodigitação está incorreta!</translation>
+        <translation>A sintaxe da sua sequência do Auto-Digitar está incorreta!</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation>Este comando de autodigitação contém um tempo de espera muito longo. Você tem certeza de que deseja continuar?</translation>
+        <translation>Este comando de Auto-Digitar contém um tempo de espera muito longo. Você tem certeza de que deseja continuar?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation>Este comando de autodigitação contém pressionamentos de teclas muito lentos. Você tem certeza de que deseja continuar?</translation>
+        <translation>Este comando de Auto-Digitar contém pressionamentos de teclas muito lentas. Você tem certeza de que deseja continuar?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation>Este comando de autodigitação contém parâmetros que são repetidos muitas vezes. Você tem certeza de que deseja continuar?</translation>
+        <translation>Este comando de Auto-Digitar contém parâmetros que são repetidos muitas vezes. Você tem certeza de que deseja continuar?</translation>
     </message>
     <message>
         <source>Permission Required</source>
@@ -450,7 +450,7 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation>KeePassXC requer a permissão de Acessibilidade para realizar Auto-Digitar no nível das entradas. Se você já garantiu as permissões, você deve reiniciar o KeePassXC.</translation>
+        <translation>KeePassXC requer a permissão de Acessibilidade para realizar Auto-Digitar no nível de entrada. Se você já garantiu as permissões, você deve reiniciar o KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -491,7 +491,7 @@
     <name>AutoTypeMatchView</name>
     <message>
         <source>Copy &amp;username</source>
-        <translation>Copiar nome de &amp;usuário</translation>
+        <translation>Copiar n&amp;ome de usuário</translation>
     </message>
     <message>
         <source>Copy &amp;password</source>
@@ -506,18 +506,18 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation>KeePassXC requer as permissões de Acessibilidade e de Gravação de Tela para realizar o Auto-Digitar global. Gravação de Tela é necessário para para usar o título da janela e encontrar as entradas. Se você já garantiu as permissões, você deve reiniciar o KeePassXC.</translation>
+        <translation>KeePassXC requer as permissões de Acessibilidade e de Gravação de Tela para realizar o Auto-Digitar global. Gravação de Tela é necessário para usar o título da janela e encontrar as entradas. Se você já garantiu as permissões, você deve reiniciar o KeePassXC.</translation>
     </message>
 </context>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Autodigitação - KeePassXC</translation>
+        <translation>Auto-Digitar - KeePassXC</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Escolha uma entrada para digitar automaticamente:</translation>
+        <translation>Escolha uma entrada para Auto-Digitar:</translation>
     </message>
     <message>
         <source>Search...</source>
@@ -528,7 +528,7 @@
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation>KeePassXC-Browser Confirmar Acesso</translation>
+        <translation>Confirmar acesso do KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Remember this decision</source>
@@ -561,7 +561,7 @@ Selecione se deseja permitir o acesso.</translation>
     <name>BrowserEntrySaveDialog</name>
     <message>
         <source>KeePassXC-Browser Save Entry</source>
-        <translation>KeePassXC-Browser Salvar Entrada</translation>
+        <translation>Salvar entrada do KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -602,7 +602,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>&amp;Firefox</source>
-        <translation>&amp;Firefox</translation>
+        <translation>F&amp;irefox</translation>
     </message>
     <message>
         <source>&amp;Chromium</source>
@@ -619,7 +619,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Pe&amp;dir para desbloquear a base de dados se estiver bloqueada</translation>
+        <translation>Pe&amp;dir para destrancar o banco de dados se estiver trancado</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
@@ -627,11 +627,11 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>&amp;Match URL scheme (e.g., https://...)</source>
-        <translation>&amp;Corresponder ao esquema de URL (por exemplo, https://...)</translation>
+        <translation>C&amp;orresponder ao esquema de URL (por exemplo, https://...)</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Retorna apenas os melhores encontrados para um URL específico em vez de todas entradas para o domínio todo.</translation>
+        <translation>Retorna apenas as melhores correspondências para um URL específico em vez de todas entradas para todo o domínio.</translation>
     </message>
     <message>
         <source>&amp;Return only best-matching credentials</source>
@@ -640,12 +640,12 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     <message>
         <source>Sort &amp;matching credentials by title</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Ordenar credenciais &amp;correspondentes por título</translation>
+        <translation>Ordenar credenciais correspondentes por &amp;título</translation>
     </message>
     <message>
         <source>Sort matching credentials by &amp;username</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Ordenar credenciais correspondentes por &amp;nome de usuário</translation>
+        <translation>Ordenar credenciais correspondentes por nome de &amp;usuário</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -654,7 +654,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     <message>
         <source>Never &amp;ask before accessing credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Nunca peça confirmação antes de &amp;acessar as credenciais</translation>
+        <translation>Nunca peça confirmação antes de acessar as c&amp;redenciais</translation>
     </message>
     <message>
         <source>Never ask before &amp;updating credentials</source>
@@ -676,11 +676,11 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
-        <translation>Atualiza o KeePassXC ou keepassxc-proxy caminho binário automaticamente para o envio de mensagens de scripts nativo na inicialização.</translation>
+        <translation>Atualiza os caminhos dos binários do KeePassXC ou keepassxc-proxy automaticamente para o envio de mensagens de scripts nativo na inicialização.</translation>
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation>Atualizar arquivos de manifesto de mensagens &amp;nativas na inicialização</translation>
+        <translation>A&amp;tualizar arquivos de manifesto de mensagens nativas na inicialização</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
@@ -688,21 +688,21 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
-        <translation>Uso um  aplicativo &amp;proxy entre KeePassXC e uma extensão do navegador</translation>
+        <translation>Usar um  aplicativo &amp;proxy entre KeePassXC e uma extensão do navegador</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
-        <translation>Use um local de proxy personalizado se você instalou um proxy manualmente.</translation>
+        <translation>Usar um local de proxy personalizado se você instalou um proxy manualmente.</translation>
     </message>
     <message>
         <source>Use a &amp;custom proxy location</source>
         <comment>Meant is the proxy for KeePassXC-Browser</comment>
-        <translation>Use um endereço de proxy &amp;customizado</translation>
+        <translation>Usar um endereço de proxy &amp;customizado</translation>
     </message>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation>Navegar...</translation>
+        <translation>Procurar...</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
@@ -714,7 +714,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>&amp;Tor Browser</source>
-        <translation>&amp;Navegador Tor</translation>
+        <translation>&amp;Tor Browser</translation>
     </message>
     <message>
         <source>Executable Files</source>
@@ -727,7 +727,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     <message>
         <source>Do not ask permission for HTTP &amp;Basic Auth</source>
         <extracomment>An extra HTTP Basic Auth setting</extracomment>
-        <translation>Não pedir  permissão para HTTP &amp;Basic Auth</translation>
+        <translation>Não pedir  permissão para &amp;HTTP Basic Auth</translation>
     </message>
     <message>
         <source>Due to Snap sandboxing, you must run a script to enable browser integration.&lt;br /&gt;You can obtain this script from %1</source>
@@ -743,7 +743,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>&amp;Brave</source>
-        <translation>&amp;Bravo</translation>
+        <translation>&amp;Brave</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
@@ -771,7 +771,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>&amp;Do not prompt for KeePassHTTP settings migration.</source>
-        <translation>&amp;Não alertar sobre a migração das configurações do KeePassHTTP.</translation>
+        <translation>Não alertar sobre a migração das configurações do &amp;KeePassHTTP.</translation>
     </message>
     <message>
         <source>Custom proxy location field</source>
@@ -779,7 +779,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
     </message>
     <message>
         <source>Browser for custom proxy file</source>
-        <translation>Navegar por arquivo proxy personalizado</translation>
+        <translation>Procurar por arquivo proxy personalizado</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning&lt;/b&gt;, the keepassxc-proxy application was not found!&lt;br /&gt;Please check the KeePassXC installation directory or confirm the custom path in advanced options.&lt;br /&gt;Browser integration WILL NOT WORK without the proxy application.&lt;br /&gt;Expected Path: %1</source>
@@ -804,7 +804,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
         <source>A shared encryption key with the name &quot;%1&quot; already exists.
 Do you want to overwrite it?</source>
         <translation>Uma chave de criptografia compartilhada com o nome &quot;%1&quot; já existe.
-Você deseja sobrescrever-la?</translation>
+Você deseja substituí-la?</translation>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
@@ -824,7 +824,7 @@ Você deseja sobrescrever-la?</translation>
     </message>
     <message>
         <source>KeePassXC: Converted KeePassHTTP attributes</source>
-        <translation>KeePassXC: Convertido KeePassHTTP atributos</translation>
+        <translation>KeePassXC: Atributos do KeePassHTTP convertidos</translation>
     </message>
     <message>
         <source>Successfully converted attributes from %1 entry(s).
@@ -878,7 +878,7 @@ Gostaria de migrar suas configurações existentes agora?</translation>
 
 Give the connection a unique name or ID, for example:
 chrome-laptop.</source>
-        <translation>Você receber um pedido de associação para o seguinte banco de dados:
+        <translation>Você recebeu um pedido de associação para o seguinte banco de dados:
 %1
 
 Dê à conexão um nome único ou um ID, por exemplo:
@@ -893,7 +893,7 @@ chrome-laptop</translation>
     </message>
     <message>
         <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Anexar &apos;-Clonar&apos; ao título</translation>
+        <translation>Anexar &apos;-Clone&apos; ao título</translation>
     </message>
     <message>
         <source>Replace username and password with references</source>
@@ -948,7 +948,7 @@ chrome-laptop</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Visualização</translation>
+        <translation>Pré-visualização</translation>
     </message>
     <message>
         <source>Column layout</source>
@@ -989,7 +989,7 @@ chrome-laptop</translation>
     <message>
         <source>CSV import: writer has errors:
 %1</source>
-        <translation>Importação de CSV: o gravador tem erros:
+        <translation>Importação de CSV: erros durante a escrita:
 %1</translation>
     </message>
     <message>
@@ -1054,7 +1054,7 @@ chrome-laptop</translation>
     </message>
     <message>
         <source>Key not transformed. This is a bug, please report it to the developers!</source>
-        <translation>Chave não transformada. Este é um bug, por favor denuncie para os desenvolvedores!</translation>
+        <translation>Chave não transformada. Este é um bug, por favor reporte para os desenvolvedores!</translation>
     </message>
     <message>
         <source>%1
@@ -1083,7 +1083,7 @@ Backup do banco de dados alocado em %2</translation>
     <name>DatabaseOpenDialog</name>
     <message>
         <source>Unlock Database - KeePassXC</source>
-        <translation>Desbloquear Banco de Dados - KeePassXC</translation>
+        <translation>Destrancar banco de dados - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -1098,16 +1098,16 @@ Backup do banco de dados alocado em %2</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Formato de chave antigo</translation>
+        <translation>Formato de arquivo-chave antigo</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation>Você está usando um formato de arquivo de chave legado que pode tornar-se sem suporte no futuro.
+        <translation>Você está usando um formato de arquivo-chave antigo que pode perder o suporte no futuro.
 
-Por favor, considere-se gerar um novo arquivo de chave.</translation>
+Por favor, considere gerar um novo arquivo-chave.</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
@@ -1135,11 +1135,11 @@ Por favor, considere-se gerar um novo arquivo de chave.</translation>
     </message>
     <message>
         <source>Unlock KeePassXC Database</source>
-        <translation>Desbloquear Banco de Dados do KeePassXC</translation>
+        <translation>Destrancar banco de dados do KeePassXC</translation>
     </message>
     <message>
         <source>Enter Password:</source>
-        <translation>Digitar Senha:</translation>
+        <translation>Digite a senha:</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -1151,7 +1151,7 @@ Por favor, considere-se gerar um novo arquivo de chave.</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation>Seleção do arquivo de chave</translation>
+        <translation>Seleção do arquivo-chave</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
@@ -1159,11 +1159,11 @@ Por favor, considere-se gerar um novo arquivo de chave.</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Navegar por arquivo chave</translation>
+        <translation>Procurar por arquivo-chave</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Navegar...</translation>
+        <translation>Procurar...</translation>
     </message>
     <message>
         <source>Refresh hardware tokens</source>
@@ -1179,7 +1179,7 @@ Por favor, considere-se gerar um novo arquivo de chave.</translation>
     </message>
     <message>
         <source>TouchID for Quick Unlock</source>
-        <translation>TouchID para desbloqueio rápido</translation>
+        <translation>TouchID para destrancar rapidamente</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -1187,29 +1187,29 @@ Por favor, considere-se gerar um novo arquivo de chave.</translation>
     </message>
     <message>
         <source>Clear Key File</source>
-        <translation>Limpar arquivo de chave</translation>
+        <translation>Limpar arquivo-chave</translation>
     </message>
     <message>
         <source>Unlock failed and no password given</source>
-        <translation>Desbloqueio falhou e nenhuma senha foi digitada</translation>
+        <translation>Destrancar falhou e nenhuma senha foi digitada</translation>
     </message>
     <message>
         <source>Unlocking the database failed and you did not enter a password.
 Do you want to retry with an &quot;empty&quot; password instead?
 
 To prevent this error from appearing, you must go to &quot;Database Settings / Security&quot; and reset your password.</source>
-        <translation>Desbloqueio do banco de dados falhou e você não digitou uma senha.
+        <translation>Falha ao destrancar banco de dados e você não digitou uma senha.
 Você quer tentar com uma senha &quot;vazia&quot;?
 
 Para impedir que esses erros apareçam, você deve ir em &quot;Configurações do banco de dados / Segurança&quot; e resetar sua senha.</translation>
     </message>
     <message>
         <source>Retry with empty password</source>
-        <translation>Retentar com senha vazia</translation>
+        <translation>Tentar novamente com senha vazia</translation>
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
-        <translation>Entre com as Credenciais Adicionais (se tiver alguma):</translation>
+        <translation>Entre com as credenciais adicionais (se tiver alguma):</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
@@ -1219,11 +1219,11 @@ Para impedir que esses erros apareçam, você deve ir em &quot;Configurações d
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Em adição à sua senha mestra, você pode usar um arquivo secreto para aumentar a segurança de seu banco de dados. Este arquivo pode ser gerado em suas configurações de segurança do banco de dados.&lt;/p&gt;&lt;p&gt;Este &lt;strong&gt;não&lt;/strong&gt; é seu arquivo de banco de dados *.kdbx!&lt;br&gt;Se você não tem um arquivo chave, deixe o campo em branco.&lt;/p&gt;&lt;p&gt;Clique para maiores informações...&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Em adição à sua senha mestra, você pode usar um arquivo secreto para aumentar a segurança de seu banco de dados. Este arquivo pode ser gerado em suas configurações de segurança do banco de dados.&lt;/p&gt;&lt;p&gt;Este &lt;strong&gt;não&lt;/strong&gt; é seu arquivo de banco de dados *.kdbx!&lt;br&gt;Se você não tem um arquivo-chave, deixe o campo em branco.&lt;/p&gt;&lt;p&gt;Clique para maiores informações...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Key file help</source>
-        <translation>Ajuda do Arquivo Chave</translation>
+        <translation>Ajuda do arquivo-chave</translation>
     </message>
     <message>
         <source>?</source>
@@ -1231,17 +1231,17 @@ Para impedir que esses erros apareçam, você deve ir em &quot;Configurações d
     </message>
     <message>
         <source>Select key file...</source>
-        <translation>Selecione um arquivo chave...</translation>
+        <translation>Selecione um arquivo-chave...</translation>
     </message>
     <message>
         <source>Cannot use database file as key file</source>
-        <translation>Não use arquivos de banco de dados (*.kdbx) como arquivo chave</translation>
+        <translation>Não use arquivos de banco de dados (*.kdbx) como arquivo-chave</translation>
     </message>
     <message>
         <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
-        <translation>Você não pode usar seu arquivo de banco de dados como arquivo chave.
-Se você não tem um arquivo chave, por favor deixe o campo vazio.</translation>
+        <translation>Você não pode usar seu arquivo de banco de dados como arquivo-chave.
+Se você não tem um arquivo-chave, por favor deixe o campo vazio.</translation>
     </message>
 </context>
 <context>
@@ -1255,7 +1255,7 @@ Se você não tem um arquivo chave, por favor deixe o campo vazio.</translation>
     <name>DatabaseSettingsDialog</name>
     <message>
         <source>Advanced Settings</source>
-        <translation>Definições avançadas</translation>
+        <translation>Configurações avançadas</translation>
     </message>
     <message>
         <source>General</source>
@@ -1271,11 +1271,11 @@ Se você não tem um arquivo chave, por favor deixe o campo vazio.</translation>
     </message>
     <message>
         <source>Encryption Settings</source>
-        <translation>Definições de cifra</translation>
+        <translation>Configurações de criptografia</translation>
     </message>
     <message>
         <source>Browser Integration</source>
-        <translation>Integração com o Navegador</translation>
+        <translation>Integração com o navegador</translation>
     </message>
 </context>
 <context>
@@ -1294,7 +1294,7 @@ Se você não tem um arquivo chave, por favor deixe o campo vazio.</translation>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
-        <translation>Mover os atributos do KeePassHTTP para o KeePassXC-Browser &amp;dados personalizados</translation>
+        <translation>Mover os atributos do KeePassHTTP para os &amp;dados personalizados do KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Stored keys</source>
@@ -1384,7 +1384,7 @@ Permissões para acessar entradas serão revogadas.</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with permissions.</source>
-        <translation>A base de dados ativa não contém uma entrada com permissões.</translation>
+        <translation>O banco de dados ativo não contém uma entrada com permissões.</translation>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to custom data</source>
@@ -1409,7 +1409,7 @@ Isso é necessário para manter a compatibilidade com o plugin do navegador.</tr
     <name>DatabaseSettingsWidgetEncryption</name>
     <message>
         <source>Encryption Algorithm:</source>
-        <translation>Algoritmo de Encriptação:</translation>
+        <translation>Algoritmo de criptografia:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -1421,7 +1421,7 @@ Isso é necessário para manter a compatibilidade com o plugin do navegador.</tr
     </message>
     <message>
         <source>Key Derivation Function:</source>
-        <translation>Função de Derivação de Chave:</translation>
+        <translation>Função de derivação da chave:</translation>
     </message>
     <message>
         <source>Transform rounds:</source>
@@ -1433,7 +1433,7 @@ Isso é necessário para manter a compatibilidade com o plugin do navegador.</tr
     </message>
     <message>
         <source>Memory Usage:</source>
-        <translation>Uso de Memória:</translation>
+        <translation>Uso de memória:</translation>
     </message>
     <message>
         <source>Parallelism:</source>
@@ -1441,7 +1441,7 @@ Isso é necessário para manter a compatibilidade com o plugin do navegador.</tr
     </message>
     <message>
         <source>Decryption Time:</source>
-        <translation>Hora da descriptografia:</translation>
+        <translation>Tempo de descriptografia:</translation>
     </message>
     <message>
         <source>?? s</source>
@@ -1487,13 +1487,13 @@ Isso é necessário para manter a compatibilidade com o plugin do navegador.</tr
     <message>
         <source>Number of rounds too high</source>
         <comment>Key transformation rounds</comment>
-        <translation>Número de voltas muito alto</translation>
+        <translation>Número de rodadas muito alto</translation>
     </message>
     <message>
         <source>You are using a very high number of key transform rounds with Argon2.
 
 If you keep this number, your database may take hours or days (or even longer) to open!</source>
-        <translation>Você está usando um número muito elevado de transformação chave rodadas com Argon2.
+        <translation>Você está usando um número muito elevado de rodadas de transformação de chave com Argon2.
 
 Se você mantiver este número, seu banco de dados pode levar horas ou dias (ou até mais) para abrir!</translation>
     </message>
@@ -1514,7 +1514,7 @@ Se você mantiver este número, seu banco de dados pode levar horas ou dias (ou
         <source>You are using a very low number of key transform rounds with AES-KDF.
 
 If you keep this number, your database may be too easy to crack!</source>
-        <translation>Você está usando um número muito baixo de transformação chave rodadas com KDF-AES.
+        <translation>Você está usando um número muito baixo de rodadas de transformação de chave com KDF-AES.
 
 Se você manter este número, seu banco de dados pode ser facilmente crackeado!</translation>
     </message>
@@ -1560,11 +1560,11 @@ Se você manter este número, seu banco de dados pode ser facilmente crackeado!<
     </message>
     <message>
         <source>Encryption algorithm</source>
-        <translation>Algorítimo da criptografia</translation>
+        <translation>Algorítimo de criptografia</translation>
     </message>
     <message>
         <source>Key derivation function</source>
-        <translation>Função de derivação de chave</translation>
+        <translation>Função de derivação da chave</translation>
     </message>
     <message>
         <source>Transform rounds</source>
@@ -1572,7 +1572,7 @@ Se você manter este número, seu banco de dados pode ser facilmente crackeado!<
     </message>
     <message>
         <source>Memory usage</source>
-        <translation>Uso da memória</translation>
+        <translation>Uso de memória</translation>
     </message>
     <message>
         <source>Parallelism</source>
@@ -1719,7 +1719,7 @@ Esta ação não é reversível.</translation>
     </message>
     <message>
         <source>No encryption key added</source>
-        <translation>Chave de cifra não adicionada</translation>
+        <translation>Chave de criptografia não adicionada</translation>
     </message>
     <message>
         <source>You must add at least one encryption key to secure your database!</source>
@@ -1908,7 +1908,7 @@ Tem certeza de que deseja continuar sem uma senha?</translation>
     </message>
     <message>
         <source>Merge database</source>
-        <translation>Juntar banco de dados</translation>
+        <translation>Mesclar banco de dados</translation>
     </message>
     <message>
         <source>Open KeePass 1 database</source>
@@ -1934,7 +1934,7 @@ Tem certeza de que deseja continuar sem uma senha?</translation>
         <source>The created database has no key or KDF, refusing to save it.
 This is definitely a bug, please report it to the developers.</source>
         <translation>O banco de dados criado não possui chave ou KDF, recusando-se a salvá-lo.
-Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</translation>
+Este é definitivamente um bug, por favor reporte para os desenvolvedores.</translation>
     </message>
     <message>
         <source>Select CSV file</source>
@@ -1952,7 +1952,7 @@ Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</tra
     <message>
         <source>%1 [Locked]</source>
         <comment>Database tab name modifier</comment>
-        <translation>%1 [Bloqueada]</translation>
+        <translation>%1 [Trancado]</translation>
     </message>
     <message>
         <source>%1 [Read-only]</source>
@@ -1965,7 +1965,7 @@ Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</tra
     </message>
     <message>
         <source>Export database to HTML file</source>
-        <translation>Exportar banco de dados como arquivo HTML</translation>
+        <translation>Exportar banco de dados como arquivo &amp;HTML</translation>
     </message>
     <message>
         <source>HTML file</source>
@@ -1996,7 +1996,7 @@ Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</tra
     </message>
     <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Pretende realmente mover a entrada &quot;%1&quot; para a lixeira?</translation>
+        <translation>Você realmente quer mover a entrada &quot;%1&quot; para a lixeira?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
@@ -2020,11 +2020,11 @@ Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</tra
     </message>
     <message>
         <source>No current database.</source>
-        <translation>Nenhuma base de dados atual.</translation>
+        <translation>Nenhum banco de dados atual.</translation>
     </message>
     <message>
         <source>No source database, nothing to do.</source>
-        <translation>Nenhuma base de dados de origem, nada a fazer.</translation>
+        <translation>Nenhum banco de dados de origem, nada a fazer.</translation>
     </message>
     <message>
         <source>Search Results (%1)</source>
@@ -2040,17 +2040,17 @@ Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</tra
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>A base de dados foi alterada. Deseja carregar as alterações?</translation>
+        <translation>O banco de dados foi alterado. Deseja carregar as alterações?</translation>
     </message>
     <message>
         <source>Merge Request</source>
-        <translation>Juntar Pedido</translation>
+        <translation>Mesclar Pedido</translation>
     </message>
     <message>
         <source>The database file has changed and you have unsaved changes.
 Do you want to merge your changes?</source>
         <translation>O arquivo de banco de dados foi alterado e você tem alterações não salvas.
-Você deseja combinar suas alterações?</translation>
+Você deseja mesclar suas alterações?</translation>
     </message>
     <message>
         <source>Empty recycle bin?</source>
@@ -2062,7 +2062,7 @@ Você deseja combinar suas alterações?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to delete %n entry(s) for good?</source>
-        <translation><numerusform>Você realmente quer apagar %n entrada(s) para o bem?</numerusform><numerusform>Você realmente quer apagar %n entrada(s) para o bem?</numerusform></translation>
+        <translation><numerusform>Você realmente quer apagar %n entrada(s) para o bem?</numerusform><numerusform>Você realmente quer apagar %n entrada(s) permanentemente?</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>Delete entry(s)?</source>
@@ -2074,11 +2074,11 @@ Você deseja combinar suas alterações?</translation>
     </message>
     <message>
         <source>Lock Database?</source>
-        <translation>Travar banco de dados?</translation>
+        <translation>Trancar banco de dados?</translation>
     </message>
     <message>
         <source>You are editing an entry. Discard changes and lock anyway?</source>
-        <translation>Você está editando uma entrada. Descartar as mudanças e travar de qualquer maneira?</translation>
+        <translation>Você está editando uma entrada. Descartar as mudanças e trancar assim mesmo?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; was modified.
@@ -2146,11 +2146,11 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Successfully merged the database files.</source>
-        <translation>Fundiu com sucesso os arquivos do banco de dados.</translation>
+        <translation>Arquivos do banco de dados foram mesclados com sucesso.</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
-        <translation>Banco de dados não foi modificado pela operação de mesclagem.</translation>
+        <translation>O banco de dados não foi modificado pela operação de mesclagem.</translation>
     </message>
     <message>
         <source>Shared group...</source>
@@ -2181,7 +2181,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Autodigitação</translation>
+        <translation>Auto-Digitar</translation>
     </message>
     <message>
         <source>Properties</source>
@@ -2285,7 +2285,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Browser Integration</source>
-        <translation>Integração com o Navegador</translation>
+        <translation>Integração com o navegador</translation>
     </message>
     <message>
         <source>&lt;empty URL&gt;</source>
@@ -2312,7 +2312,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Edit Name</source>
-        <translation>Editar Nome</translation>
+        <translation>Editar nome</translation>
     </message>
     <message>
         <source>Protect</source>
@@ -2375,15 +2375,15 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation>Habilitar Auto-Digitação para esta entrada</translation>
+        <translation>Habilitar Auto-Digitar para esta entrada</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Herdar sequência pré-definida de Auto-Digitação do &amp;grupo</translation>
+        <translation>Herdar sequência pré-definida de Auto-Digitar do &amp;grupo</translation>
     </message>
     <message>
         <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Usar sequência de Auto-Digitação personalizada:</translation>
+        <translation>&amp;Usar sequência de Auto-Digitar personalizada:</translation>
     </message>
     <message>
         <source>Window Associations</source>
@@ -2399,7 +2399,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Window title:</source>
-        <translation>Título da Janela:</translation>
+        <translation>Título da janela:</translation>
     </message>
     <message>
         <source>Use a specific sequence for this association:</source>
@@ -2411,7 +2411,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Open Auto-Type help webpage</source>
-        <translation>Abrir a página de ajuda da auto-digitar</translation>
+        <translation>Abrir a página de ajuda do Auto-Digitar</translation>
     </message>
     <message>
         <source>Existing window associations</source>
@@ -2439,7 +2439,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence for this window</source>
-        <translation>Sequência de auto-digitar personalizada para esta janela</translation>
+        <translation>Sequência de Auto-Digitar personalizada para esta janela</translation>
     </message>
 </context>
 <context>
@@ -2548,7 +2548,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation>Nome de Usuário:</translation>
+        <translation>Nome de usuário:</translation>
     </message>
     <message>
         <source>Expires</source>
@@ -2627,11 +2627,11 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Fingerprint</source>
-        <translation>Fingerprint</translation>
+        <translation>Impressão digital</translation>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
-        <translation>Remover chave do agente ao fechar/bloquear o banco de dados</translation>
+        <translation>Remover chave do agente ao fechar/trancar o banco de dados</translation>
     </message>
     <message>
         <source>Public key</source>
@@ -2639,7 +2639,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Add key to agent when database is opened/unlocked</source>
-        <translation>Adicionar chave ao agente quando abrir/desbloquear o banco de dados</translation>
+        <translation>Adicionar chave ao agente quando abrir/destrancar o banco de dados</translation>
     </message>
     <message>
         <source>Comment</source>
@@ -2668,7 +2668,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation>Navegar...</translation>
+        <translation>Procurar...</translation>
     </message>
     <message>
         <source>Attachment</source>
@@ -2692,11 +2692,11 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
         <source>Browser for key file</source>
-        <translation>Navegar por arquivo chave</translation>
+        <translation>Procurar por arquivo-chave</translation>
     </message>
     <message>
         <source>External key file</source>
-        <translation>Arquivo chave externo</translation>
+        <translation>Arquivo-chave externo</translation>
     </message>
     <message>
         <source>Select attachment file</source>
@@ -2807,7 +2807,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     <message>
         <source>Your KeePassXC version does not support sharing this container type.
 Supported extensions are: %1.</source>
-        <translation>Sua versão do KeePassXC não suporta esse tipo de recipiente.
+        <translation>Sua versão do KeePassXC não suporta compartilhamento desse tipo de recipiente.
 Extensões suportadas são: %1</translation>
     </message>
     <message>
@@ -2829,11 +2829,11 @@ Extensões suportadas são: %1</translation>
     </message>
     <message>
         <source>Database export is currently disabled by application settings.</source>
-        <translation>Exportação de banco de dados está atualmente desativado por configurações do aplicativo.</translation>
+        <translation>Exportação de banco de dados está atualmente desativado nas configurações do aplicativo.</translation>
     </message>
     <message>
         <source>Database import is currently disabled by application settings.</source>
-        <translation>Importação de banco de dados está atualmente desativado por configurações do aplicativo.</translation>
+        <translation>Importação de banco de dados está atualmente desativado nas configurações do aplicativo.</translation>
     </message>
     <message>
         <source>Sharing mode field</source>
@@ -2845,7 +2845,7 @@ Extensões suportadas são: %1</translation>
     </message>
     <message>
         <source>Browser for share file</source>
-        <translation>Navegar por arquivo compartilhado</translation>
+        <translation>Procurar por arquivo compartilhado</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -2884,7 +2884,7 @@ Extensões suportadas são: %1</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Autodigitação</translation>
+        <translation>Auto-Digitar</translation>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
@@ -2955,7 +2955,7 @@ Extensões suportadas são: %1</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos arquivos</translation>
+        <translation>Todos os arquivos</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -3337,7 +3337,7 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
     </message>
     <message>
         <source>Autotype</source>
-        <translation>Auto-Digitação</translation>
+        <translation>Auto-Digitar</translation>
     </message>
     <message>
         <source>Window</source>
@@ -3405,7 +3405,7 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
     </message>
     <message>
         <source>Hide Passwords</source>
-        <translation>Ocultar Senhas</translation>
+        <translation>Ocultar senhas</translation>
     </message>
     <message>
         <source>Fit to window</source>
@@ -3435,7 +3435,7 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
     <name>FdoSecrets::Service</name>
     <message>
         <source>Failed to register DBus service at %1: another secret service is running.</source>
-        <translation>Falha ao registrar serviço DBus em %1: outro serviço secreto está aberto.</translation>
+        <translation>Falha ao registrar serviço DBus em %1: outro Secret Service está aberto.</translation>
     </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
@@ -3447,7 +3447,7 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
     <name>FdoSecretsPlugin</name>
     <message>
         <source>Fdo Secret Service: %1</source>
-        <translation>Serviço Secreto Fdo: %1</translation>
+        <translation>Fdo Secret Service: %1</translation>
     </message>
 </context>
 <context>
@@ -3511,11 +3511,11 @@ Você pode habilitar o serviço de ícones do DuckDuckGo na seção de seguranç
     </message>
     <message>
         <source>Already Exists</source>
-        <translation>Já Existe</translation>
+        <translation>Já existe</translation>
     </message>
     <message>
         <source>Download Failed</source>
-        <translation>Falha no Download</translation>
+        <translation>Falha no download</translation>
     </message>
     <message>
         <source>Downloading favicons (%1/%2)...</source>
@@ -3714,12 +3714,12 @@ Se este erro ocorrer novamente, seu banco de dados pode estar corrompido.</trans
     <name>Kdbx4Writer</name>
     <message>
         <source>Invalid symmetric cipher algorithm.</source>
-        <translation>Algoritmo de cifra simétrica inválido.</translation>
+        <translation>Algoritmo de criptografia simétrica inválido.</translation>
     </message>
     <message>
         <source>Invalid symmetric cipher IV size.</source>
         <comment>IV = Initialization Vector for symmetric cipher</comment>
-        <translation>Tamanho de cifra simétrica IV inválida.</translation>
+        <translation>Tamanho de criptografia simétrica IV inválida.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
@@ -3735,7 +3735,7 @@ Se este erro ocorrer novamente, seu banco de dados pode estar corrompido.</trans
     <name>KdbxReader</name>
     <message>
         <source>Unsupported cipher</source>
-        <translation>Cifra não suportada</translation>
+        <translation>Criptografia não suportada</translation>
     </message>
     <message>
         <source>Invalid compression flags length</source>
@@ -3767,7 +3767,7 @@ Se este erro ocorrer novamente, seu banco de dados pode estar corrompido.</trans
     </message>
     <message>
         <source>Invalid inner random stream cipher</source>
-        <translation>Cifra de fluxo aleatório interno inválido</translation>
+        <translation>Criptografia de fluxo aleatório interno inválido</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
@@ -3778,10 +3778,10 @@ Se este erro ocorrer novamente, seu banco de dados pode estar corrompido.</trans
 
 You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
 This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>O arquivo selecionado é um velho banco de dados do  KeePass 1 (.kdb)
+        <translation>O arquivo selecionado é um banco de dados antigo do  KeePass 1 (.kdb)
 
-Você pode importá-lo clicando em Banco de Dados &gt; &quot;Importar banco de dados do KeePss 1...&quot;
-Isto é uma migração de caminho único. Você não poderá abrir o banco de dados importado com a velha versão KeePassX 0.4.</translation>
+Você pode importá-lo clicando em Banco de Dados &gt; &quot;Importar banco de dados do KeePass 1...&quot;
+Isto é uma migração de caminho único. Você não poderá abrir o banco de dados importado com a versão antiga do KeePassX 0.4.</translation>
     </message>
     <message>
         <source>Unsupported KeePass 2 database version.</source>
@@ -3789,7 +3789,7 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
     </message>
     <message>
         <source>Invalid cipher uuid length: %1 (length=%2)</source>
-        <translation>Tamanho de cifra uuid inválida: %1 (tamanho=%2)</translation>
+        <translation>Tamanho de criptografia uuid inválida: %1 (tamanho=%2)</translation>
     </message>
     <message>
         <source>Unable to parse UUID: %1</source>
@@ -3828,7 +3828,7 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
     </message>
     <message>
         <source>Invalid group icon number</source>
-        <translation>Número do grupo de ícone inválido</translation>
+        <translation>Número inválido de ícones de grupo</translation>
     </message>
     <message>
         <source>Invalid EnableAutoType value</source>
@@ -3856,7 +3856,7 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
     </message>
     <message>
         <source>Invalid entry icon number</source>
-        <translation>Item inválido número de ícone</translation>
+        <translation>Entrada de número de ícone inválida</translation>
     </message>
     <message>
         <source>History element in history entry</source>
@@ -3868,15 +3868,15 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
     </message>
     <message>
         <source>History element with different uuid</source>
-        <translation>Elemento de história com diferente uuid</translation>
+        <translation>Elemento de histórico com uuid diferente</translation>
     </message>
     <message>
         <source>Duplicate custom attribute found</source>
-        <translation>Atributo customizado duplicado encontrado</translation>
+        <translation>Atributo personalizado duplicado encontrado</translation>
     </message>
     <message>
         <source>Entry string key or value missing</source>
-        <translation>Chave de cadeia de caracteres de entrada ou valor ausente</translation>
+        <translation>Entrada de chave ou valor ausente</translation>
     </message>
     <message>
         <source>Duplicate attachment found</source>
@@ -3980,7 +3980,7 @@ Linha %2, coluna %3</translation>
     </message>
     <message>
         <source>Invalid number of transform rounds</source>
-        <translation>Número inválido de ciclos de transformção</translation>
+        <translation>Número inválido de rodadas de transformação</translation>
     </message>
     <message>
         <source>Unable to construct group tree</source>
@@ -4000,91 +4000,91 @@ Linha %2, coluna %3</translation>
     </message>
     <message>
         <source>Invalid group field type number</source>
-        <translation>Grupo inválido número do tipo de campo</translation>
+        <translation>Tipo de número do campo de grupo inválido</translation>
     </message>
     <message>
         <source>Invalid group field size</source>
-        <translation>Tamanho do campo Grupo inválido</translation>
+        <translation>Tamanho do campo de grupo inválido</translation>
     </message>
     <message>
         <source>Read group field data doesn&apos;t match size</source>
-        <translation>Leitura de grupo dados do campo não correspondem em tamanho</translation>
+        <translation>Leitura dos dados do campo de grupo não corresponde com o tamanho</translation>
     </message>
     <message>
         <source>Incorrect group id field size</source>
-        <translation>Tamanho de campo de id de grupo incorreto</translation>
+        <translation>Tamanho de campo do id do grupo incorreto</translation>
     </message>
     <message>
         <source>Incorrect group creation time field size</source>
-        <translation>Grupo incorreto tamanho do campo de hora de criação</translation>
+        <translation>Tamanho do campo de criação de tempo do grupo incorreto</translation>
     </message>
     <message>
         <source>Incorrect group modification time field size</source>
-        <translation>Grupo incorreto tamanho do campo de hora de modificação</translation>
+        <translation>Tamanho do campo de modificação do tempo do grupo incorreto</translation>
     </message>
     <message>
         <source>Incorrect group access time field size</source>
-        <translation>Grupo incorreto tamanho do campo de hora de acesso</translation>
+        <translation>Tamanho do campo de acesso do tempo do grupo incorreto</translation>
     </message>
     <message>
         <source>Incorrect group expiry time field size</source>
-        <translation>Grupo incorreto tamanho do campo de hora de expiração</translation>
+        <translation>Tamanho do campo de expiração do tempo do grupo incorreto</translation>
     </message>
     <message>
         <source>Incorrect group icon field size</source>
-        <translation>Grupo incorreto tamanho do campo de ícone</translation>
+        <translation>Tamanho do campo de ícone do grupo incorreto</translation>
     </message>
     <message>
         <source>Incorrect group level field size</source>
-        <translation>Grupo incorreto tamanho do campo de nível</translation>
+        <translation>Tamanho do campo de nível do grupo incorreto</translation>
     </message>
     <message>
         <source>Invalid group field type</source>
-        <translation>Grupo incorreto tipo de campo</translation>
+        <translation>Tipo de campo de grupo inválido</translation>
     </message>
     <message>
         <source>Missing group id or level</source>
-        <translation>Grupo ausente id ou nível </translation>
+        <translation>Id ou nível do grupo ausente</translation>
     </message>
     <message>
         <source>Missing entry field type number</source>
-        <translation>Item ausente número do tipo de campo</translation>
+        <translation>Entrada de campo para tipo de número ausente</translation>
     </message>
     <message>
         <source>Invalid entry field size</source>
-        <translation>Item inválido tamanho do campo</translation>
+        <translation>Tamanho de entrada de campo inválido</translation>
     </message>
     <message>
         <source>Read entry field data doesn&apos;t match size</source>
-        <translation>Leitura do dados de campo de entrada não correspondem com o tamanho</translation>
+        <translation>Leitura do campo de entrada de dados não corresponde ao tamanho</translation>
     </message>
     <message>
         <source>Invalid entry uuid field size</source>
-        <translation>Entrada inválida tamanho do campo uuid</translation>
+        <translation>Tamanho de campo de entrada uuid inválida</translation>
     </message>
     <message>
         <source>Invalid entry group id field size</source>
-        <translation>Item inválido tamanho do campo de id de grupo</translation>
+        <translation>Tamanho de entrada do campo de id do grupo inválido</translation>
     </message>
     <message>
         <source>Invalid entry icon field size</source>
-        <translation>Item inválido tamanho de campo de ícone</translation>
+        <translation>Tamanho de entrada do campo de ícone inválido</translation>
     </message>
     <message>
         <source>Invalid entry creation time field size</source>
-        <translation>Item inválido tamanho do campo de hora de criação</translation>
+        <translation>Tamanho de entrada do campo de criação do tempo inválido</translation>
     </message>
     <message>
         <source>Invalid entry modification time field size</source>
-        <translation>Item inválido Tamanho do campo de hora de modificação</translation>
+        <translation>Tamanho de entrada do campo de modificação do tempo inválido</translation>
     </message>
     <message>
         <source>Invalid entry expiry time field size</source>
-        <translation>Tamanho de campo de tempo de expiração entrada inválida</translation>
+        <translation>Tamanho de entrada do campo de expiração do tempo inválido</translation>
     </message>
     <message>
         <source>Invalid entry field type</source>
-        <translation>Tipo de campo de entrada inválido</translation>
+        <translation>Tipo de entrada de campo inválido</translation>
     </message>
     <message>
         <source>unable to seek to content position</source>
@@ -4191,30 +4191,30 @@ Se este erro ocorrer novamente, seu banco de dados pode estar corrompido.</trans
     </message>
     <message>
         <source>Key File</source>
-        <translation>Arquivo Chave</translation>
+        <translation>Arquivo-chave</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Você pode adicionar um arquivo de chave contendo bytes aleatórios para segurança adicional.&lt;/p&gt;&lt;p&gt;Você deve mantê-lo em segredo e nunca perdê-lo ou você será bloqueado!&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Você pode adicionar um arquivo-chave contendo bytes aleatórios para segurança adicional.&lt;/p&gt;&lt;p&gt;Você deve mantê-lo em segredo e nunca perdê-lo ou você será bloqueado!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Formato de chave antigo</translation>
+        <translation>Formato de arquivo-chave antigo</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please go to the master key settings and generate a new key file.</source>
-        <translation>Você está usando um formato de arquivo de chave antigo que pode ficar
+        <translation>Você está usando um formato de arquivo-chave antigo que pode ficar
 sem suporte no futuro.
 
-Por favor, vá para as configurações da chave mestra e gere um novo arquivo de chave.</translation>
+Por favor, vá para as configurações da senha mestre e gere um novo arquivo-chave.</translation>
     </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
-        <translation>Erro ao carregar o arquivo de chave &apos;%1&apos;
+        <translation>Erro ao carregar o arquivo-chave &apos;%1&apos;
 Mensagem: %2</translation>
     </message>
     <message>
@@ -4227,15 +4227,15 @@ Mensagem: %2</translation>
     </message>
     <message>
         <source>Create Key File...</source>
-        <translation>Criar Arquivo-Chave...</translation>
+        <translation>Criar arquivo-chave...</translation>
     </message>
     <message>
         <source>Error creating key file</source>
-        <translation>Erro ao criar o arquivo de chave</translation>
+        <translation>Erro ao criar o arquivo-chave</translation>
     </message>
     <message>
         <source>Unable to create key file: %1</source>
-        <translation>Não foi possível criar arquivo de chave: %1</translation>
+        <translation>Não foi possível criar arquivo-chave: %1</translation>
     </message>
     <message>
         <source>Select a key file</source>
@@ -4243,40 +4243,40 @@ Mensagem: %2</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation>Seleção do arquivo de chave</translation>
+        <translation>Seleção do arquivo-chave</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Navegar por arquivo chave</translation>
+        <translation>Procurar por arquivo-chave</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Navegar...</translation>
+        <translation>Procurar...</translation>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation>Gerar um novo arquivo chave</translation>
+        <translation>Gerar um novo arquivo-chave</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Nota: Não use um arquivo que possa ser modificado, pois isso irá impedir que você desbloqueie seu banco de dados!</translation>
+        <translation>Nota: Não use um arquivo que possa ser modificado, pois isso irá impedir que você destranque seu banco de dados!</translation>
     </message>
     <message>
         <source>Invalid Key File</source>
-        <translation>Arquivo chave inválido</translation>
+        <translation>Arquivo-chave inválido</translation>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
-        <translation>Você não pode usar o banco de dados atual como seu próprio arquivo chave. Por favor, escolha um arquivo diferente ou faça um novo arquivo chave.</translation>
+        <translation>Você não pode usar o banco de dados atual como seu próprio arquivo-chave. Por favor, escolha um arquivo diferente ou gere um novo arquivo-chave.</translation>
     </message>
     <message>
         <source>Suspicious Key File</source>
-        <translation>Arquivo chave suspeito</translation>
+        <translation>Arquivo-chave suspeito</translation>
     </message>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation>O arquivo chave escolhido parece com um arquivo de banco de dados. Um arquivo chave deve ser um arquivo estático que nunca sofrerá mudanças, pois senão você perderá acesso ao seu banco de dados para sempre.
+        <translation>O arquivo-chave escolhido parece com um arquivo de banco de dados. Um arquivo-chave deve ser um arquivo estático que nunca sofrerá mudanças, pois senão você perderá acesso ao seu banco de dados para sempre.
 Tem certeza que deseja continuar com este arquivo?</translation>
     </message>
 </context>
@@ -4320,11 +4320,11 @@ Tem certeza que deseja continuar com este arquivo?</translation>
     </message>
     <message>
         <source>&amp;Save database</source>
-        <translation>&amp;Salvar base de dados</translation>
+        <translation>&amp;Salvar banco de dados</translation>
     </message>
     <message>
         <source>&amp;Close database</source>
-        <translation>&amp;Fechar base de dados</translation>
+        <translation>&amp;Fechar banco de dados</translation>
     </message>
     <message>
         <source>&amp;Delete entry</source>
@@ -4336,7 +4336,7 @@ Tem certeza que deseja continuar com este arquivo?</translation>
     </message>
     <message>
         <source>&amp;Delete group</source>
-        <translation>&amp;Apagar grupo</translation>
+        <translation>A&amp;pagar grupo</translation>
     </message>
     <message>
         <source>Sa&amp;ve database as...</source>
@@ -4352,7 +4352,7 @@ Tem certeza que deseja continuar com este arquivo?</translation>
     </message>
     <message>
         <source>Copy &amp;username</source>
-        <translation>Copiar nome de &amp;usuário</translation>
+        <translation>Copiar n&amp;ome de usuário</translation>
     </message>
     <message>
         <source>Copy username to clipboard</source>
@@ -4368,7 +4368,7 @@ Tem certeza que deseja continuar com este arquivo?</translation>
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation>&amp;Trancar base de dados</translation>
+        <translation>&amp;Trancar banco de dados</translation>
     </message>
     <message>
         <source>&amp;Title</source>
@@ -4502,7 +4502,7 @@ Recomendamos que você use o AppImage disponível em nossa página de downloads.
     </message>
     <message>
         <source>&amp;New group</source>
-        <translation>&amp;Novo Grupo</translation>
+        <translation>&amp;Novo grupo</translation>
     </message>
     <message>
         <source>Add a new group</source>
@@ -4510,7 +4510,7 @@ Recomendamos que você use o AppImage disponível em nossa página de downloads.
     </message>
     <message>
         <source>Change master &amp;key...</source>
-        <translation>Mudar &amp;chave mestra</translation>
+        <translation>M&amp;udar chave mestra</translation>
     </message>
     <message>
         <source>&amp;Database settings...</source>
@@ -4522,7 +4522,7 @@ Recomendamos que você use o AppImage disponível em nossa página de downloads.
     </message>
     <message>
         <source>Perform &amp;Auto-Type</source>
-        <translation>Executar &amp;Auto Digitação</translation>
+        <translation>Executar Auto-&amp;Digitar</translation>
     </message>
     <message>
         <source>Open &amp;URL</source>
@@ -4550,7 +4550,7 @@ Recomendamos que você use o AppImage disponível em nossa página de downloads.
     </message>
     <message>
         <source>Show TOTP QR Code...</source>
-        <translation>Exibir Código QR do TOTP...</translation>
+        <translation>Exibir QR Code do TOTP...</translation>
     </message>
     <message>
         <source>NOTE: You are using a pre-release version of KeePassXC!
@@ -4576,11 +4576,11 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
-        <translation>&amp;Verificar Atualizações...</translation>
+        <translation>&amp;Verificar por atualizações...</translation>
     </message>
     <message>
         <source>Downlo&amp;ad all favicons</source>
-        <translation>Downlo&amp;ad todos os favicons</translation>
+        <translation>&amp;Baixar todos os favicons</translation>
     </message>
     <message>
         <source>Sort &amp;A-Z</source>
@@ -4620,7 +4620,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>&amp;Online Help...</source>
-        <translation>&amp;Ajuda Online...</translation>
+        <translation>Ajuda &amp;Online...</translation>
     </message>
     <message>
         <source>Go to online documentation (opens browser)</source>
@@ -4726,7 +4726,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>En&amp;cryption Settings</source>
-        <translation>Definições de &amp;cifra</translation>
+        <translation>Configurações de &amp;criptografia</translation>
     </message>
     <message>
         <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
@@ -4734,18 +4734,18 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Advanced Settings</source>
-        <translation>Definições avançadas</translation>
+        <translation>Configurações avançadas</translation>
     </message>
     <message>
         <source>Simple Settings</source>
-        <translation>Definições básicas</translation>
+        <translation>Configurações básicas</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizardPageEncryption</name>
     <message>
         <source>Encryption Settings</source>
-        <translation>Definições de cifra</translation>
+        <translation>Configurações de criptografia</translation>
     </message>
     <message>
         <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
@@ -4786,7 +4786,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Unable to init cipher for opdata01: %1</source>
-        <translation>Não foi possível iniciar cifra para opdata01: %1</translation>
+        <translation>Não foi possível iniciar criptografia para opdata01: %1</translation>
     </message>
     <message>
         <source>Unable to read all HMAC signature bytes</source>
@@ -4838,14 +4838,14 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Unable to derive master key: %1</source>
-        <translation>Não foi possível derivar senha-mestra: %1</translation>
+        <translation>Não foi possível derivar senha mestre: %1</translation>
     </message>
 </context>
 <context>
     <name>OpenSSHKey</name>
     <message>
         <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation>Arquivo chave inválido, é esperado uma chave OpenSSH</translation>
+        <translation>Arquivo-chave inválido. É esperado uma chave OpenSSH</translation>
     </message>
     <message>
         <source>PEM boundary mismatch</source>
@@ -4857,11 +4857,11 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Key file way too small.</source>
-        <translation>O modo do arquivo chave é muito pequeno.</translation>
+        <translation>O arquivo-chave é muito pequeno.</translation>
     </message>
     <message>
         <source>Key file magic header id invalid</source>
-        <translation>O id do cabeçalho mágico do arquivo chave é invalido</translation>
+        <translation>O id do cabeçalho mágico do arquivo-chave é invalido</translation>
     </message>
     <message>
         <source>Found zero keys</source>
@@ -4873,7 +4873,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
-        <translation>Arquivo chave corrompido, leitura da chave privada falhou</translation>
+        <translation>Arquivo-chave corrompido. Leitura da chave privada falhou</translation>
     </message>
     <message>
         <source>No private key payload to decrypt</source>
@@ -4885,15 +4885,15 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Passphrase is required to decrypt this key</source>
-        <translation>Senha é necessária para decriptar esta chave</translation>
+        <translation>Frase secreta é necessária para descriptografar esta chave</translation>
     </message>
     <message>
         <source>Key derivation failed, key file corrupted?</source>
-        <translation>A derivação da chave falhou, o arquivo chave esta corrompido?</translation>
+        <translation>A derivação da chave falhou. O arquivo-chave esta corrompido?</translation>
     </message>
     <message>
         <source>Decryption failed, wrong passphrase?</source>
-        <translation>Decriptação falhou, senha errada?</translation>
+        <translation>Descriptografia falhou, frase secreta errada?</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading public key</source>
@@ -4925,11 +4925,11 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Unknown cipher: %1</source>
-        <translation>Cifra desconhecida: %1</translation>
+        <translation>Criptografia desconhecida: %1</translation>
     </message>
     <message>
         <source>Cipher IV is too short for MD5 kdf</source>
-        <translation>Cifra de IV é muito curta para MD5 kdf</translation>
+        <translation>Criptografia de IV é muito curta para MD5 kdf</translation>
     </message>
     <message>
         <source>Unknown KDF: %1</source>
@@ -4955,7 +4955,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     <name>PasswordEditWidget</name>
     <message>
         <source>Enter password:</source>
-        <translation>Insira senha:</translation>
+        <translation>Digite a senha:</translation>
     </message>
     <message>
         <source>Confirm password:</source>
@@ -5043,7 +5043,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Passphrase</source>
-        <translation>Senha</translation>
+        <translation>Frase secreta</translation>
     </message>
     <message>
         <source>Wordlist:</source>
@@ -5191,7 +5191,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Regenerate</source>
-        <translation>Regenerar</translation>
+        <translation>Gerar novamente</translation>
     </message>
     <message>
         <source>Generated password</source>
@@ -5235,7 +5235,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Regenerate password</source>
-        <translation>Regerar senha</translation>
+        <translation>Gerar senha novamente</translation>
     </message>
     <message>
         <source>Copy password</source>
@@ -5289,7 +5289,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Empty</source>
-        <translation>Vazio</translation>
+        <translation>Esvaziar</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -5305,7 +5305,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Merge</source>
-        <translation>Fundir</translation>
+        <translation>Mesclar</translation>
     </message>
     <message>
         <source>Continue</source>
@@ -5336,7 +5336,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>KeePassXC association failed, try again</source>
-        <translation>KeePassXC associação falhou, tente novamente</translation>
+        <translation>Associação KeePassXC falhou, tente novamente</translation>
     </message>
     <message>
         <source>Encryption key is not recognized</source>
@@ -5456,9 +5456,9 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation>Aviso: Você está usando um formato de arquivo de chave legado que pode tornar-se sem suporte no futuro.
+        <translation>Aviso: Você está usando um formato de arquivo-chave antigo que pode perder o suporte no futuro.
 
-Por favor, considere gerar um novo arquivo de chave.</translation>
+Por favor, considere gerar um novo arquivo-chave.</translation>
     </message>
     <message>
         <source>
@@ -5492,11 +5492,11 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Merge two databases.</source>
-        <translation>Juntar dois bancos de dados.</translation>
+        <translation>Mesclar dois bancos de dados.</translation>
     </message>
     <message>
         <source>Path of the database to merge from.</source>
-        <translation>Caminho do banco de dados para combinar como base.</translation>
+        <translation>Caminho do banco de dados para mesclar como base.</translation>
     </message>
     <message>
         <source>Use the same credentials for both database files.</source>
@@ -5504,7 +5504,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
-        <translation>Arquivo de chave do banco de dados para combinar como base.</translation>
+        <translation>Arquivo-chave do banco de dados para mesclar como base.</translation>
     </message>
     <message>
         <source>Show an entry&apos;s information.</source>
@@ -5584,11 +5584,11 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Generate a new random diceware passphrase.</source>
-        <translation>Gere uma senha aleatória diceware novamente.</translation>
+        <translation>Gere uma frase secreta diceware aleatória novamente.</translation>
     </message>
     <message>
         <source>Word count for the diceware passphrase.</source>
-        <translation>Contagem de palavra para a frase-chave diceware.</translation>
+        <translation>Contagem de palavra para a frase secreta diceware.</translation>
     </message>
     <message>
         <source>Wordlist for the diceware generator.
@@ -5626,7 +5626,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Entry %1 not found.</source>
-        <translation>Entrada%1 não encontrada.</translation>
+        <translation>Entrada %1 não encontrada.</translation>
     </message>
     <message>
         <source>Entry with path %1 has no TOTP set up.</source>
@@ -5650,7 +5650,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Silence password prompt and other secondary outputs.</source>
-        <translation>Pergunta por senha em silêncio e outras saídas secundárias.</translation>
+        <translation>Perguntar por senha em silêncio e outras saídas secundárias.</translation>
     </message>
     <message>
         <source>count</source>
@@ -5779,7 +5779,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Failed to load key file %1: %2</source>
-        <translation>Falha ao carregar o arquivo de chave %1: %2</translation>
+        <translation>Falha ao carregar o arquivo-chave %1: %2</translation>
     </message>
     <message>
         <source>Length of the generated password</source>
@@ -5828,7 +5828,7 @@ Comandos disponíveis:
     <message>
         <source>Error reading merge file:
 %1</source>
-        <translation>Erro ao ler arquivo para fundir:
+        <translation>Erro ao ler arquivo de mesclagem:
 %1</translation>
     </message>
     <message>
@@ -5849,7 +5849,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Show the entry&apos;s current TOTP.</source>
-        <translation>Mostrar o TOTP atual da entrada.</translation>
+        <translation>Mostrar o TOTP da entrada atual.</translation>
     </message>
     <message>
         <source>ERROR: unknown attribute %1.</source>
@@ -5923,7 +5923,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Loading the key file failed</source>
-        <translation>O carregamento do arquivo de chave falhou</translation>
+        <translation>O carregamento do arquivo-chave falhou</translation>
     </message>
     <message>
         <source>No key is set. Aborting database creation.</source>
@@ -5939,11 +5939,11 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Creating KeyFile %1 failed: %2</source>
-        <translation>Criação de Arquivo-Chave %1 falhou: %2</translation>
+        <translation>Criação de arquivo-chave %1 falhou: %2</translation>
     </message>
     <message>
         <source>Loading KeyFile %1 failed: %2</source>
-        <translation>Carregamento de Arquivo-Chave %1 falhou: %2</translation>
+        <translation>Carregamento de arquivo-chave %1 falhou: %2</translation>
     </message>
     <message>
         <source>Path of the entry to remove.</source>
@@ -6011,7 +6011,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Deactivate password key for the database to merge from.</source>
-        <translation>Desativar chave de senha para o banco de dados a qual será fundido.</translation>
+        <translation>Desativar chave de senha para o banco de dados a qual será mesclado.</translation>
     </message>
     <message>
         <source>Version %1</source>
@@ -6047,7 +6047,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Autodigitação</translation>
+        <translation>Auto-Digitar</translation>
     </message>
     <message>
         <source>KeeShare (signed and unsigned sharing)</source>
@@ -6059,7 +6059,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>KeeShare (only unsigned sharing)</source>
-        <translation>KeeShare (apenas compartilhamento não assinado)</translation>
+        <translation>KeeShare (somente compartilhamento não assinado)</translation>
     </message>
     <message>
         <source>YubiKey</source>
@@ -6215,7 +6215,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Only print the changes detected by the merge operation.</source>
-        <translation>Somente exibir mudanças detectadas pela operação de fusão.</translation>
+        <translation>Somente exibir mudanças detectadas pela operação de mesclagem.</translation>
     </message>
     <message>
         <source>Yubikey slot for the second database.</source>
@@ -6223,7 +6223,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Successfully merged %1 into %2.</source>
-        <translation>Sucesso ao fundir %1 com %2.</translation>
+        <translation>Sucesso ao mesclar %1 com %2.</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
@@ -6287,7 +6287,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Enter password to unlock %1: </source>
-        <translation>Digite a senha para desbloquear %1:</translation>
+        <translation>Digite a senha para destrancar %1:</translation>
     </message>
     <message>
         <source>Invalid YubiKey slot %1</source>
@@ -6295,7 +6295,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Please touch the button on your YubiKey to unlock %1</source>
-        <translation>Por favor toque no botão no seu YubiKey para desbloquear %1</translation>
+        <translation>Por favor toque no botão no seu YubiKey para destrancar %1</translation>
     </message>
     <message>
         <source>Enter password to encrypt database (optional): </source>
@@ -6307,7 +6307,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Secret Service Integration</source>
-        <translation>Serviço de Integração Secreta</translation>
+        <translation>Integração com Secret Service</translation>
     </message>
     <message>
         <source>User name</source>
@@ -6554,7 +6554,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Unlock database to show more information</source>
-        <translation>Desbloquear banco de dados para mostrar mais informações</translation>
+        <translation>Destranque o banco de dados para mostrar mais informações</translation>
     </message>
     <message>
         <source>Lock database</source>
@@ -6562,7 +6562,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Unlock to show</source>
-        <translation>Desbloquear para mostrar</translation>
+        <translation>Destrancar para mostrar</translation>
     </message>
     <message>
         <source>None</source>
@@ -6645,7 +6645,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Fingerprint</source>
-        <translation>Fingerprint</translation>
+        <translation>Impressão digital</translation>
     </message>
     <message>
         <source>Certificate</source>
@@ -6670,7 +6670,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>KeeShare key file</source>
-        <translation>Arquivo chave KeeShare</translation>
+        <translation>Arquivo-chave KeeShare</translation>
     </message>
     <message>
         <source>All files</source>
@@ -6773,11 +6773,11 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Overwriting unsigned share container is not supported - export prevented</source>
-        <translation>A substituição de contêiner de compartilhamento não assinado não é suportada - exportação impedida</translation>
+        <translation>A substituição de recipiente de compartilhamento não assinado não é suportada - exportação impedida</translation>
     </message>
     <message>
         <source>Could not write export container</source>
-        <translation>Não foi possível escrever o contêiner de exportação</translation>
+        <translation>Não foi possível escrever o recipiente de exportação</translation>
     </message>
     <message>
         <source>Unexpected export error occurred</source>
@@ -6788,15 +6788,15 @@ Kernel: %3 %4</translation>
     <name>ShareImport</name>
     <message>
         <source>Import from container without signature</source>
-        <translation>Importar do contêiner sem assinatura</translation>
+        <translation>Importar do recipiente sem assinatura</translation>
     </message>
     <message>
         <source>We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?</source>
-        <translation>Não podemos verificar a origem do contêiner compartilhado porque ele não está assinado. Você realmente quer importar de %1?</translation>
+        <translation>Não podemos verificar a origem do recipiente compartilhado porque ele não está assinado. Você realmente quer importar de %1?</translation>
     </message>
     <message>
         <source>Import from container with certificate</source>
-        <translation>Importar do contêiner com certificado</translation>
+        <translation>Importar do recipiente com certificado</translation>
     </message>
     <message>
         <source>Do you want to trust %1 with the fingerprint of %2 from %3?</source>
@@ -6828,7 +6828,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Invalid sharing container</source>
-        <translation>Contêiner de compartilhamento inválido</translation>
+        <translation>Recipiente de compartilhamento inválido</translation>
     </message>
     <message>
         <source>Untrusted import prevented</source>
@@ -6898,7 +6898,7 @@ Kernel: %3 %4</translation>
     <name>TotpDialog</name>
     <message>
         <source>Timed Password</source>
-        <translation>Senha Temporária</translation>
+        <translation>Senha temporária</translation>
     </message>
     <message>
         <source>000000</source>
@@ -6926,7 +6926,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>There was an error creating the QR code.</source>
-        <translation>Ocorreu um erro ao criar o código QR.</translation>
+        <translation>Ocorreu um erro ao criar o QR Code.</translation>
     </message>
     <message>
         <source>Closing in %1 seconds.</source>
diff --git a/share/translations/keepassx_pt_PT.ts b/share/translations/keepassx_pt_PT.ts
index b6d339905a..1bdb9f80cd 100644
--- a/share/translations/keepassx_pt_PT.ts
+++ b/share/translations/keepassx_pt_PT.ts
@@ -747,11 +747,11 @@ Selecione a base de dados correta para guardar as credenciais.</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
-        <translation>Devolve as credenciais expiradas. Adiciona [expirada] ao título.</translation>
+        <translation>Devolve as credenciais caducadas. Adiciona [caducada] ao título.</translation>
     </message>
     <message>
         <source>&amp;Allow returning expired credentials.</source>
-        <translation>Permitir devolução de credencias expir&amp;adas</translation>
+        <translation>Permitir devolução de credencias caduc&amp;adas</translation>
     </message>
     <message>
         <source>Enable browser integration</source>
@@ -1830,11 +1830,11 @@ Tem a certeza de que deseja continuar?</translation>
     </message>
     <message>
         <source>Number of expired entries</source>
-        <translation>Número de entradas expiradas</translation>
+        <translation>Número de entradas caducadas</translation>
     </message>
     <message>
         <source>The database contains entries that have expired.</source>
-        <translation>A base de dados contém entradas expiradas.</translation>
+        <translation>A base de dados contém entradas caducadas.</translation>
     </message>
     <message>
         <source>Unique passwords</source>
@@ -2553,7 +2553,7 @@ Desativar salvaguardas e tentar novamente?</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Expira</translation>
+        <translation>Caduca</translation>
     </message>
     <message>
         <source>Url field</source>
@@ -2585,15 +2585,15 @@ Desativar salvaguardas e tentar novamente?</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation>Campo Expira</translation>
+        <translation>Campo Caduca</translation>
     </message>
     <message>
         <source>Expiration Presets</source>
-        <translation>Predefinições de expiração</translation>
+        <translation>Predefinições de caducidade</translation>
     </message>
     <message>
         <source>Expiration presets</source>
-        <translation>Predefinições de expiração</translation>
+        <translation>Predefinições de caducidade</translation>
     </message>
     <message>
         <source>Notes field</source>
@@ -2609,7 +2609,7 @@ Desativar salvaguardas e tentar novamente?</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation>Alternar expiração</translation>
+        <translation>Alternar caducidade</translation>
     </message>
 </context>
 <context>
@@ -2813,11 +2813,11 @@ As extensões suportadas são: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
-        <translation>%1 já está a ser exportada para esta base de dados.</translation>
+        <translation>%1 já está a ser exportado para esta base de dados.</translation>
     </message>
     <message>
         <source>%1 is already being imported by this database.</source>
-        <translation>%1 já está a ser importada para esta base de dados.</translation>
+        <translation>%1 já está a ser importado para esta base de dados.</translation>
     </message>
     <message>
         <source>%1 is being imported and exported by different groups in this database.</source>
@@ -2877,7 +2877,7 @@ As extensões suportadas são: %1.</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Expira</translation>
+        <translation>Caduca</translation>
     </message>
     <message>
         <source>Search</source>
@@ -2905,7 +2905,7 @@ As extensões suportadas são: %1.</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation>Alternar expiração</translation>
+        <translation>Alternar caducidade</translation>
     </message>
     <message>
         <source>Auto-Type toggle for this and sub groups</source>
@@ -2913,7 +2913,7 @@ As extensões suportadas são: %1.</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation>Campo Expira</translation>
+        <translation>Campo Caduca</translation>
     </message>
     <message>
         <source>Search toggle for this and sub groups</source>
@@ -3271,7 +3271,7 @@ Esta ação pode implicar um funcionamento errático.</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Expira</translation>
+        <translation>Caduca</translation>
     </message>
     <message>
         <source>Created</source>
@@ -3318,7 +3318,7 @@ Esta ação pode implicar um funcionamento errático.</translation>
     </message>
     <message>
         <source>Expiration</source>
-        <translation>Expira</translation>
+        <translation>Caducidade</translation>
     </message>
     <message>
         <source>URL</source>
@@ -4029,7 +4029,7 @@ Linha %2, coluna %3</translation>
     </message>
     <message>
         <source>Incorrect group expiry time field size</source>
-        <translation>Tamanho de campo de tempo de expiração de grupo incorreto</translation>
+        <translation>Tamanho inválido para o campo de caducidade do grupo</translation>
     </message>
     <message>
         <source>Incorrect group icon field size</source>
@@ -4081,7 +4081,7 @@ Linha %2, coluna %3</translation>
     </message>
     <message>
         <source>Invalid entry expiry time field size</source>
-        <translation>Tamanho da entrada para o campo tempo de expiração inválido</translation>
+        <translation>Tamanho inválido para o campo de caducidade da entrada</translation>
     </message>
     <message>
         <source>Invalid entry field type</source>
@@ -4181,7 +4181,7 @@ Caso isto volte a acontecer, pode ser que a base de dados esteja danificada.</tr
     <message>
         <source>%1 set, click to change or remove</source>
         <comment>Change or remove a key component</comment>
-        <translation>%1 definido, clique para alterar ou remover</translation>
+        <translation>%1 definida, clique para alterar ou remover</translation>
     </message>
 </context>
 <context>
@@ -6912,7 +6912,7 @@ Kernel: %3 %4</translation>
     </message>
     <message numerus="yes">
         <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
-        <translation><numerusform>Expira em &lt;b&gt;%n&lt;/b&gt; segundo</numerusform><numerusform>Expira dentro de &lt;b&gt;%n&lt;/b&gt; segundos</numerusform></translation>
+        <translation><numerusform>Caduca dentro de &lt;b&gt;%n&lt;/b&gt; segundo</numerusform><numerusform>Caduca dentro de &lt;b&gt;%n&lt;/b&gt; segundos</numerusform></translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/keepassx_ro.ts b/share/translations/keepassx_ro.ts
index bd4f02fbd4..469e4ddd19 100644
--- a/share/translations/keepassx_ro.ts
+++ b/share/translations/keepassx_ro.ts
@@ -97,11 +97,11 @@
     </message>
     <message>
         <source>Reset Settings?</source>
-        <translation type="unfinished"/>
+        <translation>Resetare Setări?</translation>
     </message>
     <message>
         <source>Are you sure you want to reset all general and security settings to default?</source>
-        <translation type="unfinished"/>
+        <translation>Sigur resetați în mod implicit toate setările generale și de securitate ?</translation>
     </message>
 </context>
 <context>
@@ -225,63 +225,63 @@
     </message>
     <message>
         <source>Remember previously used databases</source>
-        <translation type="unfinished"/>
+        <translation>Retine bazele de date utilizate anterior</translation>
     </message>
     <message>
         <source>Load previously open databases on startup</source>
-        <translation type="unfinished"/>
+        <translation>la pornirea incărcarea bazelor de date deschise anterior </translation>
     </message>
     <message>
         <source>Remember database key files and security dongles</source>
-        <translation type="unfinished"/>
+        <translation>Retine fișierele cheie de baze de date și Dongles de securitate</translation>
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
-        <translation type="unfinished"/>
+        <translation>Căutați actualizări la pornirea aplicației o dată pe săptămână</translation>
     </message>
     <message>
         <source>Include beta releases when checking for updates</source>
-        <translation type="unfinished"/>
+        <translation>Includere versiuni beta la verificarea actualizărilor</translation>
     </message>
     <message>
         <source>Button style:</source>
-        <translation type="unfinished"/>
+        <translation>Stilul butonului:</translation>
     </message>
     <message>
         <source>Language:</source>
-        <translation type="unfinished"/>
+        <translation>Limba:</translation>
     </message>
     <message>
         <source>(restart program to activate)</source>
-        <translation type="unfinished"/>
+        <translation>(reporniți programul pentru a activa)</translation>
     </message>
     <message>
         <source>Minimize window after unlocking database</source>
-        <translation type="unfinished"/>
+        <translation>Minimizare fereastră după deblocarea bazei de date</translation>
     </message>
     <message>
         <source>Minimize when opening a URL</source>
-        <translation type="unfinished"/>
+        <translation>Minimizare la deschiderea unui URL</translation>
     </message>
     <message>
         <source>Hide window when copying to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Ascundere fereastră la copierea în Clipboard</translation>
     </message>
     <message>
         <source>Minimize</source>
-        <translation type="unfinished"/>
+        <translation>Minimizare</translation>
     </message>
     <message>
         <source>Drop to background</source>
-        <translation type="unfinished"/>
+        <translation>Picătură în fundal</translation>
     </message>
     <message>
         <source>Favicon download timeout:</source>
-        <translation type="unfinished"/>
+        <translation>Favicon download timeout:</translation>
     </message>
     <message>
         <source>Website icon download timeout in seconds</source>
-        <translation type="unfinished"/>
+        <translation>Site-ul descărca pictograma timeout în câteva secunde</translation>
     </message>
     <message>
         <source> sec</source>
@@ -290,31 +290,31 @@
     </message>
     <message>
         <source>Toolbar button style</source>
-        <translation type="unfinished"/>
+        <translation>Stil buton bară de instrumente</translation>
     </message>
     <message>
         <source>Use monospaced font for Notes</source>
-        <translation type="unfinished"/>
+        <translation>Utilizați fontul monospațiat pentru notițe</translation>
     </message>
     <message>
         <source>Language selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea limbii</translation>
     </message>
     <message>
         <source>Reset Settings to Default</source>
-        <translation type="unfinished"/>
+        <translation>Resetare setări la implicit</translation>
     </message>
     <message>
         <source>Global auto-type shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Comandă rapidă de tip auto global</translation>
     </message>
     <message>
         <source>Auto-type character typing delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation>Tipul de auto-tastare întârziere milisecunde</translation>
     </message>
     <message>
         <source>Auto-type start delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation>Auto-tip de pornire întârziere milisecunde</translation>
     </message>
 </context>
 <context>
@@ -390,19 +390,19 @@
     </message>
     <message>
         <source>Use DuckDuckGo service to download website icons</source>
-        <translation type="unfinished"/>
+        <translation>Utilizați serviciul DuckDuckGo pentru a descărca pictogramele site-ului</translation>
     </message>
     <message>
         <source>Clipboard clear seconds</source>
-        <translation type="unfinished"/>
+        <translation>Stergere clipboard  secunde </translation>
     </message>
     <message>
         <source>Touch ID inactivity reset</source>
-        <translation type="unfinished"/>
+        <translation>Resetare inactivitate ID Touch</translation>
     </message>
     <message>
         <source>Database lock timeout seconds</source>
-        <translation type="unfinished"/>
+        <translation>Baza de date blocare timeout secunde</translation>
     </message>
     <message>
         <source> min</source>
@@ -411,7 +411,7 @@
     </message>
     <message>
         <source>Clear search query after</source>
-        <translation type="unfinished"/>
+        <translation>Stergerea interogarea de căutare după</translation>
     </message>
 </context>
 <context>
@@ -446,11 +446,11 @@
     </message>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Permisiune necesară</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC necesită permisiunea de accesibilitate pentru a efectua intrare nivel auto-Type. Dacă ați acordat deja permisiunea, poate fi nevoie să reporniți KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -502,11 +502,11 @@
     <name>AutoTypePlatformMac</name>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Permisiune necesară</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC necesită permisiunea Accesorizării și Recorderului ecranului pentru a efectua tipul automat global. Înregistrarea ecranului este necesară pentru a utiliza titlul ferestrei pentru a găsi intrări. Dacă ați acordat deja permisiunea, poate fi necesar să reporniți KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -550,11 +550,11 @@ Vă rugăm să selectați dacă doriți să permiteți accesul.</translation>
     </message>
     <message>
         <source>Allow access</source>
-        <translation type="unfinished"/>
+        <translation>Permite accesul</translation>
     </message>
     <message>
         <source>Deny access</source>
-        <translation type="unfinished"/>
+        <translation>Refuzare acces</translation>
     </message>
 </context>
 <context>
@@ -743,47 +743,47 @@ Selectați baza de date corectă pentru salvarea acreditărilor.</translation>
     </message>
     <message>
         <source>&amp;Brave</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Brave</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
-        <translation type="unfinished"/>
+        <translation>Returnează acreditările expirate. String [expirat] se adaugă la titlu.</translation>
     </message>
     <message>
         <source>&amp;Allow returning expired credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Permite returnarea acreditărilor expirate.</translation>
     </message>
     <message>
         <source>Enable browser integration</source>
-        <translation type="unfinished"/>
+        <translation>Activați integrarea browserului</translation>
     </message>
     <message>
         <source>Browsers installed as snaps are currently not supported.</source>
-        <translation type="unfinished"/>
+        <translation>Browserele instalate ca snaps nu sunt acceptate momentan.</translation>
     </message>
     <message>
         <source>All databases connected to the extension will return matching credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Toate bazele de date conectate la extensie vor returna acreditările corespondente.</translation>
     </message>
     <message>
         <source>Don&apos;t display the popup suggesting migration of legacy KeePassHTTP settings.</source>
-        <translation type="unfinished"/>
+        <translation>Nu afișați popup-ul sugerând migrarea setărilor KeePassHTTP moștenite.</translation>
     </message>
     <message>
         <source>&amp;Do not prompt for KeePassHTTP settings migration.</source>
-        <translation type="unfinished"/>
+        <translation> Nu solicitați migrarea setărilor KeePassHTTP.</translation>
     </message>
     <message>
         <source>Custom proxy location field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp de locație proxy particularizat</translation>
     </message>
     <message>
         <source>Browser for custom proxy file</source>
-        <translation type="unfinished"/>
+        <translation>Browser pentru fișier proxy personalizat</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning&lt;/b&gt;, the keepassxc-proxy application was not found!&lt;br /&gt;Please check the KeePassXC installation directory or confirm the custom path in advanced options.&lt;br /&gt;Browser integration WILL NOT WORK without the proxy application.&lt;br /&gt;Expected Path: %1</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Avertisment&lt;/b&gt;, aplicația keepassxc-proxy nu a fost găsită! &lt;br /&gt;Vă rugăm să verificați directorul de instalare KeePassXC sau să confirmați calea personalizată în opțiuni avansate. &lt;br /&gt;Integrarea browser-ului NU va funcționa fără aplicația proxy. &lt;br /&gt;Calea așteptată: %1</translation>
     </message>
 </context>
 <context>
@@ -877,7 +877,11 @@ Migrați acum setările existente?</translation>
 
 Give the connection a unique name or ID, for example:
 chrome-laptop.</source>
-        <translation type="unfinished"/>
+        <translation>Ați primit o solicitare de asociere pentru următoarea bază de date:
+%1
+
+Dați conexiunii un nume sau un ID unic, de exemplu:
+chrome-laptop.</translation>
     </message>
 </context>
 <context>
@@ -989,19 +993,19 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Text qualification</source>
-        <translation type="unfinished"/>
+        <translation>Calificarea textului</translation>
     </message>
     <message>
         <source>Field separation</source>
-        <translation type="unfinished"/>
+        <translation>Separarea câmpului</translation>
     </message>
     <message>
         <source>Number of header lines to discard</source>
-        <translation type="unfinished"/>
+        <translation>Numărul de linii de antet de aruncat</translation>
     </message>
     <message>
         <source>CSV import preview</source>
-        <translation type="unfinished"/>
+        <translation>Previzualizare import CSV</translation>
     </message>
 </context>
 <context>
@@ -1054,19 +1058,20 @@ chrome-laptop.</source>
     <message>
         <source>%1
 Backup database located at %2</source>
-        <translation type="unfinished"/>
+        <translation>%1
+Baza de date de rezervă localizată la %2</translation>
     </message>
     <message>
         <source>Could not save, database does not point to a valid file.</source>
-        <translation type="unfinished"/>
+        <translation>Nu s-a putut salva, baza de date nu indică un fișier valid.</translation>
     </message>
     <message>
         <source>Could not save, database file is read-only.</source>
-        <translation type="unfinished"/>
+        <translation>Nu s-a putut salva, fișierul bazei de date este numai în citire.</translation>
     </message>
     <message>
         <source>Database file has unmerged changes.</source>
-        <translation type="unfinished"/>
+        <translation>Fișierul bazei de date are modificări nemergite.</translation>
     </message>
     <message>
         <source>Recycle Bin</source>
@@ -1122,39 +1127,39 @@ Vă rugăm să luați în considerare generarea unui nou fișier cheie.</transla
     </message>
     <message>
         <source>Failed to open key file: %1</source>
-        <translation type="unfinished"/>
+        <translation>Nu a putut fi deschis fișierul cheii: %1</translation>
     </message>
     <message>
         <source>Select slot...</source>
-        <translation type="unfinished"/>
+        <translation>Selectați slotul ...</translation>
     </message>
     <message>
         <source>Unlock KeePassXC Database</source>
-        <translation type="unfinished"/>
+        <translation>Deblocați baza de date KeePassXC</translation>
     </message>
     <message>
         <source>Enter Password:</source>
-        <translation type="unfinished"/>
+        <translation>Introdu parola:</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp parola</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Comutați vizibilitatea parolelor</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea fișierelor cheie</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea sloturilor pentru cheie hardware</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Căutați fișierul cheie</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1162,19 +1167,19 @@ Vă rugăm să luați în considerare generarea unui nou fișier cheie.</transla
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Actualizați jetoane hardware</translation>
     </message>
     <message>
         <source>Hardware Key:</source>
-        <translation type="unfinished"/>
+        <translation>Cheie hardware:</translation>
     </message>
     <message>
         <source>Hardware key help</source>
-        <translation type="unfinished"/>
+        <translation>Ajutor cheie hardware</translation>
     </message>
     <message>
         <source>TouchID for Quick Unlock</source>
-        <translation type="unfinished"/>
+        <translation>TouchID pentru deblocare rapidă</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -1182,56 +1187,61 @@ Vă rugăm să luați în considerare generarea unui nou fișier cheie.</transla
     </message>
     <message>
         <source>Clear Key File</source>
-        <translation type="unfinished"/>
+        <translation>Ștergeți fișierul cheie</translation>
     </message>
     <message>
         <source>Unlock failed and no password given</source>
-        <translation type="unfinished"/>
+        <translation>Deblocarea a eșuat și nu a fost dată nicio parolă</translation>
     </message>
     <message>
         <source>Unlocking the database failed and you did not enter a password.
 Do you want to retry with an &quot;empty&quot; password instead?
 
 To prevent this error from appearing, you must go to &quot;Database Settings / Security&quot; and reset your password.</source>
-        <translation type="unfinished"/>
+        <translation>Deblocarea bazei de date a eșuat și nu ați introdus o parolă.
+Vrei să încerci din nou cu o parolă „goală”?
+
+Pentru a preveni apariția acestei erori, trebuie să accesați „Setări baza de date / securitate” și să vă resetați parola.</translation>
     </message>
     <message>
         <source>Retry with empty password</source>
-        <translation type="unfinished"/>
+        <translation>Încercați din nou cu parola goală</translation>
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
-        <translation type="unfinished"/>
+        <translation>Introduceți acreditări suplimentare (dacă există):</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Puteți utiliza o cheie de securitate hardware, cum ar fi &lt;strong&gt;YubiKey&lt;/strong&gt; sau &lt;strong&gt;OnlyKey&lt;/strong&gt;, cu sloturi configurate pentru HMAC-SHA1.&lt;/p&gt;
+&lt;p&gt;Faceți clic pentru mai multe informații ...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;În plus față de parola principală, puteți utiliza un fișier secret pentru a îmbunătăți securitatea bazei de date. Un astfel de fișier poate fi generat în setările de securitate ale bazei de date&lt;/p&gt;. &lt;p&gt;Acesta &lt;strong&gt;nu&lt;/strong&gt; este fișierul dvs. de bază de date * .kdbx!&lt;br&gt; Dacă nu aveți un fișier cheie, lăsați câmpul gol.&lt;/p&gt; &lt;p&gt;Faceți clic pentru mai multe informații ...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Key file help</source>
-        <translation type="unfinished"/>
+        <translation>Ajutor de fișiere cheie</translation>
     </message>
     <message>
         <source>?</source>
-        <translation type="unfinished"/>
+        <translation>?</translation>
     </message>
     <message>
         <source>Select key file...</source>
-        <translation type="unfinished"/>
+        <translation>Selectați fișierul cheie ...</translation>
     </message>
     <message>
         <source>Cannot use database file as key file</source>
-        <translation type="unfinished"/>
+        <translation>Nu se poate utiliza fișierul bazei de date ca fișier cheie</translation>
     </message>
     <message>
         <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
-        <translation type="unfinished"/>
+        <translation>Nu puteți utiliza fișierul dvs. de bază de date ca fișier cheie.
+Dacă nu aveți un fișier cheie, lăsați câmpul gol.</translation>
     </message>
 </context>
 <context>
@@ -1388,11 +1398,11 @@ Acest lucru este necesar pentru a menține compatibilitatea cu plugin-ul browser
     </message>
     <message>
         <source>Stored browser keys</source>
-        <translation type="unfinished"/>
+        <translation>Tastele browserului stocate</translation>
     </message>
     <message>
         <source>Remove selected key</source>
-        <translation type="unfinished"/>
+        <translation>Ștergeți tasta selectată</translation>
     </message>
 </context>
 <context>
@@ -1538,54 +1548,54 @@ Dacă păstrați acest număr, baza de date poate fi prea ușor de spart!</trans
     </message>
     <message>
         <source>Change existing decryption time</source>
-        <translation type="unfinished"/>
+        <translation>Modificați timpul de decriptare existent</translation>
     </message>
     <message>
         <source>Decryption time in seconds</source>
-        <translation type="unfinished"/>
+        <translation>Timpul de decriptare în secunde</translation>
     </message>
     <message>
         <source>Database format</source>
-        <translation type="unfinished"/>
+        <translation>Formatul bazei de date</translation>
     </message>
     <message>
         <source>Encryption algorithm</source>
-        <translation type="unfinished"/>
+        <translation>Algoritmul de criptare</translation>
     </message>
     <message>
         <source>Key derivation function</source>
-        <translation type="unfinished"/>
+        <translation>Funcția cheie de derivare</translation>
     </message>
     <message>
         <source>Transform rounds</source>
-        <translation type="unfinished"/>
+        <translation>Rundele de transformare</translation>
     </message>
     <message>
         <source>Memory usage</source>
-        <translation type="unfinished"/>
+        <translation>Folosirea memoriei</translation>
     </message>
     <message>
         <source>Parallelism</source>
-        <translation type="unfinished"/>
+        <translation>Paralelism</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetFdoSecrets</name>
     <message>
         <source>Exposed Entries</source>
-        <translation type="unfinished"/>
+        <translation>Intrări expuse</translation>
     </message>
     <message>
         <source>Don&apos;t e&amp;xpose this database</source>
-        <translation type="unfinished"/>
+        <translation>Nu e&amp;xpuneti această bază de date</translation>
     </message>
     <message>
         <source>Expose entries &amp;under this group:</source>
-        <translation type="unfinished"/>
+        <translation>Expuneti intrări și sub acest grup:</translation>
     </message>
     <message>
         <source>Enable fd.o Secret Service to access these settings.</source>
-        <translation type="unfinished"/>
+        <translation>Activează fd.o Secret Service pentru a accesa aceste setări.</translation>
     </message>
 </context>
 <context>
@@ -1636,36 +1646,37 @@ Dacă păstrați acest număr, baza de date poate fi prea ușor de spart!</trans
     </message>
     <message>
         <source>Database name field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul numelui bazei de date</translation>
     </message>
     <message>
         <source>Database description field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul descrierii bazei de date</translation>
     </message>
     <message>
         <source>Default username field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul utilizatorului implicit</translation>
     </message>
     <message>
         <source>Maximum number of history items per entry</source>
-        <translation type="unfinished"/>
+        <translation>Numărul maxim de articole istorice pe intrare</translation>
     </message>
     <message>
         <source>Maximum size of history per entry</source>
-        <translation type="unfinished"/>
+        <translation>Mărimea maximă a istoricului pe intrare</translation>
     </message>
     <message>
         <source>Delete Recycle Bin</source>
-        <translation type="unfinished"/>
+        <translation>Ștergeți coșul de reciclare</translation>
     </message>
     <message>
         <source>Do you want to delete the current recycle bin and all its contents?
 This action is not reversible.</source>
-        <translation type="unfinished"/>
+        <translation>Doriți să ștergeți coșul de reciclare curent și tot conținutul acesteia?
+Această acțiune nu este reversibilă.</translation>
     </message>
     <message>
         <source> (old)</source>
-        <translation type="unfinished"/>
+        <translation>(vechi)</translation>
     </message>
 </context>
 <context>
@@ -1736,7 +1747,7 @@ Sigur continuați fără parolă?</translation>
     </message>
     <message>
         <source>Continue without password</source>
-        <translation type="unfinished"/>
+        <translation>Continuați fără parolă</translation>
     </message>
 </context>
 <context>
@@ -1751,22 +1762,22 @@ Sigur continuați fără parolă?</translation>
     </message>
     <message>
         <source>Database name field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul numelui bazei de date</translation>
     </message>
     <message>
         <source>Database description field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul descrierii bazei de date</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetStatistics</name>
     <message>
         <source>Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Statistici</translation>
     </message>
     <message>
         <source>Hover over lines with error icons for further information.</source>
-        <translation type="unfinished"/>
+        <translation>Treceți peste linii cu pictograme de eroare pentru informații suplimentare.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1778,103 +1789,103 @@ Sigur continuați fără parolă?</translation>
     </message>
     <message>
         <source>Database name</source>
-        <translation type="unfinished"/>
+        <translation>Numele bazei de date</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Descriere</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation type="unfinished"/>
+        <translation>Locație</translation>
     </message>
     <message>
         <source>Last saved</source>
-        <translation type="unfinished"/>
+        <translation>Ultima salvare</translation>
     </message>
     <message>
         <source>Unsaved changes</source>
-        <translation type="unfinished"/>
+        <translation>Modificări salvate</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"/>
+        <translation>da</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"/>
+        <translation>Nu</translation>
     </message>
     <message>
         <source>The database was modified, but the changes have not yet been saved to disk.</source>
-        <translation type="unfinished"/>
+        <translation>Baza de date a fost modificată, dar modificările nu au fost încă salvate pe disc.</translation>
     </message>
     <message>
         <source>Number of groups</source>
-        <translation type="unfinished"/>
+        <translation>Număr de grupuri</translation>
     </message>
     <message>
         <source>Number of entries</source>
-        <translation type="unfinished"/>
+        <translation>Numărul de intrări</translation>
     </message>
     <message>
         <source>Number of expired entries</source>
-        <translation type="unfinished"/>
+        <translation>Numărul de intrări expirate</translation>
     </message>
     <message>
         <source>The database contains entries that have expired.</source>
-        <translation type="unfinished"/>
+        <translation>Baza de date conține intrări care au expirat.</translation>
     </message>
     <message>
         <source>Unique passwords</source>
-        <translation type="unfinished"/>
+        <translation>Parole unice</translation>
     </message>
     <message>
         <source>Non-unique passwords</source>
-        <translation type="unfinished"/>
+        <translation>Parole non-unice</translation>
     </message>
     <message>
         <source>More than 10% of passwords are reused. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Mai mult de 10% din parolele sunt reutilizate. Utilizați parole unice atunci când este posibil.</translation>
     </message>
     <message>
         <source>Maximum password reuse</source>
-        <translation type="unfinished"/>
+        <translation>Reutilizarea maximă a parolei</translation>
     </message>
     <message>
         <source>Some passwords are used more than three times. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Unele parole sunt folosite de mai mult de trei ori. Utilizați parole unice atunci când este posibil.</translation>
     </message>
     <message>
         <source>Number of short passwords</source>
-        <translation type="unfinished"/>
+        <translation>Număr de parole scurte</translation>
     </message>
     <message>
         <source>Recommended minimum password length is at least 8 characters.</source>
-        <translation type="unfinished"/>
+        <translation>Lungimea minimă recomandată a parolei este de cel puțin 8 caractere.</translation>
     </message>
     <message>
         <source>Number of weak passwords</source>
-        <translation type="unfinished"/>
+        <translation>Număr de parole slabe</translation>
     </message>
     <message>
         <source>Recommend using long, randomized passwords with a rating of &apos;good&apos; or &apos;excellent&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Recomandă folosirea parolelor lungi, aleatorii, cu o notă de „bun” sau „excelent”.</translation>
     </message>
     <message>
         <source>Average password length</source>
-        <translation type="unfinished"/>
+        <translation>Lungimea medie a parolei</translation>
     </message>
     <message>
         <source>%1 characters</source>
-        <translation type="unfinished"/>
+        <translation>%1 caractere</translation>
     </message>
     <message>
         <source>Average password length is less than ten characters. Longer passwords provide more security.</source>
-        <translation type="unfinished"/>
+        <translation>Lungimea medie a parolei este mai mică de zece caractere. Parolele mai lungi oferă mai multă securitate.</translation>
     </message>
     <message>
         <source>Please wait, database statistics are being calculated...</source>
-        <translation type="unfinished"/>
+        <translation>Vă rugăm să așteptați, se calculează statisticile bazei de date ...</translation>
     </message>
 </context>
 <context>
@@ -1950,27 +1961,27 @@ Acest lucru este cu siguranta un bug, vă rugăm să raporteze la dezvoltatori.<
     </message>
     <message>
         <source>Failed to open %1. It either does not exist or is not accessible.</source>
-        <translation type="unfinished"/>
+        <translation>Nu a reușit să deschidă %1. Fie nu există, fie nu este accesibil.</translation>
     </message>
     <message>
         <source>Export database to HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Exportați baza de date în fișier HTML</translation>
     </message>
     <message>
         <source>HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Fișier HTML</translation>
     </message>
     <message>
         <source>Writing the HTML file failed.</source>
-        <translation type="unfinished"/>
+        <translation>Scrierea fișierului HTML a eșuat.</translation>
     </message>
     <message>
         <source>Export Confirmation</source>
-        <translation type="unfinished"/>
+        <translation>Confirmare la export</translation>
     </message>
     <message>
         <source>You are about to export your database to an unencrypted file. This will leave your passwords and sensitive information vulnerable! Are you sure you want to continue?</source>
-        <translation type="unfinished"/>
+        <translation>Ești pe cale să exporti baza de date într-un fișier necriptat. Acest lucru va lăsa parolele și informațiile dvs. sensibile vulnerabile! Esti sigur ca vrei sa continui?</translation>
     </message>
 </context>
 <context>
@@ -2151,7 +2162,7 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>This database is opened in read-only mode. Autosave is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Această bază de date este deschisă în modul numai de citire. Autosave este dezactivat.</translation>
     </message>
 </context>
 <context>
@@ -2278,11 +2289,11 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>&lt;empty URL&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;empty URL&gt;</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this URL?</source>
-        <translation type="unfinished"/>
+        <translation>Sigur doriți să eliminați această adresă URL?</translation>
     </message>
 </context>
 <context>
@@ -2325,39 +2336,39 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Attribute selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea atributelor</translation>
     </message>
     <message>
         <source>Attribute value</source>
-        <translation type="unfinished"/>
+        <translation>Valoarea atributului</translation>
     </message>
     <message>
         <source>Add a new attribute</source>
-        <translation type="unfinished"/>
+        <translation>Adăugați un atribut nou</translation>
     </message>
     <message>
         <source>Remove selected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Ștergeți atributul selectat</translation>
     </message>
     <message>
         <source>Edit attribute name</source>
-        <translation type="unfinished"/>
+        <translation>Editați numele atributului</translation>
     </message>
     <message>
         <source>Toggle attribute protection</source>
-        <translation type="unfinished"/>
+        <translation>Comutați protecția atributelor</translation>
     </message>
     <message>
         <source>Show a protected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Afișați un atribut protejat</translation>
     </message>
     <message>
         <source>Foreground color selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea culorilor prim-plan</translation>
     </message>
     <message>
         <source>Background color selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea culorii de fundal</translation>
     </message>
 </context>
 <context>
@@ -2396,46 +2407,46 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Secvență personalizată Auto-Type</translation>
     </message>
     <message>
         <source>Open Auto-Type help webpage</source>
-        <translation type="unfinished"/>
+        <translation>Deschideți pagina web de ajutor Auto-Type</translation>
     </message>
     <message>
         <source>Existing window associations</source>
-        <translation type="unfinished"/>
+        <translation>Asocieri de ferestre existente</translation>
     </message>
     <message>
         <source>Add new window association</source>
-        <translation type="unfinished"/>
+        <translation>Adăugați asociere fereastră nouă</translation>
     </message>
     <message>
         <source>Remove selected window association</source>
-        <translation type="unfinished"/>
+        <translation>Eliminați asocierea ferestrei selectată</translation>
     </message>
     <message>
         <source>You can use an asterisk (*) to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Puteți utiliza un asterisc (*) pentru a se potrivi cu totul</translation>
     </message>
     <message>
         <source>Set the window association title</source>
-        <translation type="unfinished"/>
+        <translation>Setați titlul asocierii ferestrei</translation>
     </message>
     <message>
         <source>You can use an asterisk to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Puteți utiliza un asterisc pentru a se potrivi cu totul</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence for this window</source>
-        <translation type="unfinished"/>
+        <translation>Secvență personalizată de tip automat pentru această fereastră</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetBrowser</name>
     <message>
         <source>These settings affect to the entry&apos;s behaviour with the browser extension.</source>
-        <translation type="unfinished"/>
+        <translation>Aceste setări afectează comportamentul intrării cu extensia browserului.</translation>
     </message>
     <message>
         <source>General</source>
@@ -2443,15 +2454,15 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Skip Auto-Submit for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Sariți la Trimitere automată pentru această intrare</translation>
     </message>
     <message>
         <source>Hide this entry from the browser extension</source>
-        <translation type="unfinished"/>
+        <translation>Ascundeți această intrare din extensia browserului</translation>
     </message>
     <message>
         <source>Additional URL&apos;s</source>
-        <translation type="unfinished"/>
+        <translation>Adresa URL suplimentară</translation>
     </message>
     <message>
         <source>Add</source>
@@ -2463,7 +2474,7 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"/>
+        <translation>Editați </translation>
     </message>
 </context>
 <context>
@@ -2486,23 +2497,23 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Entry history selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea istoricului de intrare</translation>
     </message>
     <message>
         <source>Show entry at selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Afișare intrare la starea istoricului selectat</translation>
     </message>
     <message>
         <source>Restore entry to selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Restaurați intrarea la starea istoricului selectat</translation>
     </message>
     <message>
         <source>Delete selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Ștergeți starea istoricului selectat</translation>
     </message>
     <message>
         <source>Delete all history</source>
-        <translation type="unfinished"/>
+        <translation>Ștergeți tot istoricul</translation>
     </message>
 </context>
 <context>
@@ -2545,59 +2556,59 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Url field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp url</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Descărcați favicon pentru URL</translation>
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Repetați câmpul de parolă</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Comutați generatorul de parolă</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp parola</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Comutați vizibilitatea parolelor</translation>
     </message>
     <message>
         <source>Toggle notes visible</source>
-        <translation type="unfinished"/>
+        <translation>Notele de comutare sunt vizibile</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp de expirare</translation>
     </message>
     <message>
         <source>Expiration Presets</source>
-        <translation type="unfinished"/>
+        <translation>Presetări expirare</translation>
     </message>
     <message>
         <source>Expiration presets</source>
-        <translation type="unfinished"/>
+        <translation>Presetări expirare</translation>
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul de note</translation>
     </message>
     <message>
         <source>Title field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul titlu</translation>
     </message>
     <message>
         <source>Username field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul utilizatorului</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation type="unfinished"/>
+        <translation>Combate expirarea</translation>
     </message>
 </context>
 <context>
@@ -2677,19 +2688,19 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
-        <translation type="unfinished"/>
+        <translation>Scoateți cheia din agent după câteva secunde specificate</translation>
     </message>
     <message>
         <source>Browser for key file</source>
-        <translation type="unfinished"/>
+        <translation>Browser pentru fișierul cheie</translation>
     </message>
     <message>
         <source>External key file</source>
-        <translation type="unfinished"/>
+        <translation>Fișier cheie externă</translation>
     </message>
     <message>
         <source>Select attachment file</source>
-        <translation type="unfinished"/>
+        <translation>Selectați fișierul de atașament</translation>
     </message>
 </context>
 <context>
@@ -2791,65 +2802,66 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizeaza</translation>
     </message>
     <message>
         <source>Your KeePassXC version does not support sharing this container type.
 Supported extensions are: %1.</source>
-        <translation type="unfinished"/>
+        <translation>Versiunea dvs. KeePassXC nu acceptă distribuirea acestui tip de container.
+Extensiile acceptate sunt: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 este deja exportat de această bază de date.</translation>
     </message>
     <message>
         <source>%1 is already being imported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 este deja importat de această bază de date.</translation>
     </message>
     <message>
         <source>%1 is being imported and exported by different groups in this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 este importat și exportat de diferite grupuri din această bază de date.</translation>
     </message>
     <message>
         <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
         <comment>KeeShare is a proper noun</comment>
-        <translation type="unfinished"/>
+        <translation>În prezent, KeeShare este dezactivat. Puteți activa importul / exportul în setările aplicației.</translation>
     </message>
     <message>
         <source>Database export is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Exportul bazei de date este dezactivat în prezent de setările aplicației.</translation>
     </message>
     <message>
         <source>Database import is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Importul bazei de date este dezactivat în prezent de setările aplicației.</translation>
     </message>
     <message>
         <source>Sharing mode field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul modului de partajare</translation>
     </message>
     <message>
         <source>Path to share file field</source>
-        <translation type="unfinished"/>
+        <translation>Calea de partajare a câmpului de fișiere</translation>
     </message>
     <message>
         <source>Browser for share file</source>
-        <translation type="unfinished"/>
+        <translation>Browser pentru partajarea fișierului</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp parola</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Comutați vizibilitatea parolelor</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Comutați generatorul de parolă</translation>
     </message>
     <message>
         <source>Clear fields</source>
-        <translation type="unfinished"/>
+        <translation>Câmpuri clare</translation>
     </message>
 </context>
 <context>
@@ -2884,31 +2896,31 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Name field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul de nume</translation>
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul de note</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation type="unfinished"/>
+        <translation>Combate expirarea</translation>
     </message>
     <message>
         <source>Auto-Type toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Comută automat pentru această opțiune și subgrupuri</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp de expirare</translation>
     </message>
     <message>
         <source>Search toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Căutați pentru aceasta și subgrupuri</translation>
     </message>
     <message>
         <source>Default auto-type sequence field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul de secvență implicit de tip automat</translation>
     </message>
 </context>
 <context>
@@ -2975,39 +2987,39 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
-        <translation type="unfinished"/>
+        <translation>Puteți activa serviciul de pictogramă a site-ului web DuckDuckGo în Instrumente -&gt; Setări -&gt; Securitate</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Descărcați favicon pentru URL</translation>
     </message>
     <message>
         <source>Apply selected icon to subgroups and entries</source>
-        <translation type="unfinished"/>
+        <translation>Aplicați pictograma selectată pe subgrupuri și intrări</translation>
     </message>
     <message>
         <source>Apply icon &amp;to ...</source>
-        <translation type="unfinished"/>
+        <translation>Aplicați pictograma &amp; în ...</translation>
     </message>
     <message>
         <source>Apply to this only</source>
-        <translation type="unfinished"/>
+        <translation>Aplicați numai la acest aspect</translation>
     </message>
     <message>
         <source>Also apply to child groups</source>
-        <translation type="unfinished"/>
+        <translation>De asemenea, aplicați pentru grupuri de copii</translation>
     </message>
     <message>
         <source>Also apply to child entries</source>
-        <translation type="unfinished"/>
+        <translation>De asemenea, aplicați pentru înregistrările copilului</translation>
     </message>
     <message>
         <source>Also apply to all children</source>
-        <translation type="unfinished"/>
+        <translation>De asemenea, aplicați tuturor copiilor</translation>
     </message>
     <message>
         <source>Existing icon selected.</source>
-        <translation type="unfinished"/>
+        <translation>Pictograma existentă selectată.</translation>
     </message>
 </context>
 <context>
@@ -3056,27 +3068,27 @@ Acest lucru poate provoca moduluri afectate la defecțiune.</translation>
     </message>
     <message>
         <source>Datetime created</source>
-        <translation type="unfinished"/>
+        <translation>Datetime creat</translation>
     </message>
     <message>
         <source>Datetime modified</source>
-        <translation type="unfinished"/>
+        <translation>Datetime modificat</translation>
     </message>
     <message>
         <source>Datetime accessed</source>
-        <translation type="unfinished"/>
+        <translation>Data datei accesată</translation>
     </message>
     <message>
         <source>Unique ID</source>
-        <translation type="unfinished"/>
+        <translation>ID unic</translation>
     </message>
     <message>
         <source>Plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Date despre pluginuri</translation>
     </message>
     <message>
         <source>Remove selected plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Eliminați datele pluginului selectate</translation>
     </message>
 </context>
 <context>
@@ -3181,19 +3193,19 @@ Acest lucru poate provoca moduluri afectate la defecțiune.</translation>
     </message>
     <message>
         <source>Add new attachment</source>
-        <translation type="unfinished"/>
+        <translation>Adăugați un nou atașament</translation>
     </message>
     <message>
         <source>Remove selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Eliminați atașamentul selectat</translation>
     </message>
     <message>
         <source>Open selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Deschideți atașamentul selectat</translation>
     </message>
     <message>
         <source>Save selected attachment to disk</source>
-        <translation type="unfinished"/>
+        <translation>Salvați atașamentul selectat pe disc</translation>
     </message>
 </context>
 <context>
@@ -3375,7 +3387,7 @@ Acest lucru poate provoca moduluri afectate la defecțiune.</translation>
     </message>
     <message>
         <source>Display current TOTP value</source>
-        <translation type="unfinished"/>
+        <translation>Afișează valoarea curentă TOTP</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -3417,26 +3429,26 @@ Acest lucru poate provoca moduluri afectate la defecțiune.</translation>
     <name>FdoSecrets::Item</name>
     <message>
         <source>Entry &quot;%1&quot; from database &quot;%2&quot; was used by %3</source>
-        <translation type="unfinished"/>
+        <translation>Intrarea „%1” din baza de date „%2” a fost utilizată de %3</translation>
     </message>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
     <message>
         <source>Failed to register DBus service at %1: another secret service is running.</source>
-        <translation type="unfinished"/>
+        <translation>Nu a reușit să înregistrați serviciul DBus la %1: este executat un alt serviciu secret.</translation>
     </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>% n Intrărea a fost utilizata de %1</numerusform><numerusform>%n Intrările au fost utilizate de %1</numerusform><numerusform>%n Intrările au fost utilizate de %1</numerusform></translation>
     </message>
 </context>
 <context>
     <name>FdoSecretsPlugin</name>
     <message>
         <source>Fdo Secret Service: %1</source>
-        <translation type="unfinished"/>
+        <translation>Serviciu secret Fdo: %1</translation>
     </message>
 </context>
 <context>
@@ -3462,7 +3474,7 @@ Acest lucru poate provoca moduluri afectate la defecțiune.</translation>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation type="unfinished"/>
+        <translation>Descarcă Favicons</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -3471,7 +3483,8 @@ Acest lucru poate provoca moduluri afectate la defecțiune.</translation>
     <message>
         <source>Having trouble downloading icons?
 You can enable the DuckDuckGo website icon service in the security section of the application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Aveți probleme la descărcarea pictogramelor?
+Puteți activa serviciul pictogramelor site-ului web DuckDuckGo în secțiunea de securitate a setărilor aplicației.</translation>
     </message>
     <message>
         <source>Close</source>
@@ -3487,11 +3500,11 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Please wait, processing entry list...</source>
-        <translation type="unfinished"/>
+        <translation>Vă rugăm să așteptați, prelucrarea listei de intrare ...</translation>
     </message>
     <message>
         <source>Downloading...</source>
-        <translation type="unfinished"/>
+        <translation>Descărcarea...</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -3499,15 +3512,15 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Already Exists</source>
-        <translation type="unfinished"/>
+        <translation>Deja exista</translation>
     </message>
     <message>
         <source>Download Failed</source>
-        <translation type="unfinished"/>
+        <translation>Descarcare esuata</translation>
     </message>
     <message>
         <source>Downloading favicons (%1/%2)...</source>
-        <translation type="unfinished"/>
+        <translation>Descărcarea de preferințe (%1/%2) ...</translation>
     </message>
 </context>
 <context>
@@ -3554,7 +3567,8 @@ You can enable the DuckDuckGo website icon service in the security section of th
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Au fost furnizate datele de acreditare nevalide, încercați din nou.
+Dacă reîncepe, atunci fișierul dvs. de bază de date poate fi corupt.</translation>
     </message>
 </context>
 <context>
@@ -3689,11 +3703,12 @@ If this reoccurs, then your database file may be corrupt.</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Au fost furnizate datele de acreditare nevalide, încercați din nou.
+Dacă reîncepe, atunci fișierul dvs. de bază de date poate fi corupt.</translation>
     </message>
     <message>
         <source>(HMAC mismatch)</source>
-        <translation type="unfinished"/>
+        <translation>(Nepotrivire HMAC)</translation>
     </message>
 </context>
 <context>
@@ -3922,7 +3937,7 @@ Linia %2, coloana %3</translation>
     </message>
     <message>
         <source>Import KeePass1 Database</source>
-        <translation type="unfinished"/>
+        <translation>Importați baza de date KeePass1</translation>
     </message>
 </context>
 <context>
@@ -4079,18 +4094,19 @@ Linia %2, coloana %3</translation>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Au fost furnizate datele de acreditare nevalide, încercați din nou.
+Dacă reîncepe, atunci fișierul dvs. de bază de date poate fi corupt.</translation>
     </message>
 </context>
 <context>
     <name>KeeShare</name>
     <message>
         <source>Invalid sharing reference</source>
-        <translation type="unfinished"/>
+        <translation>Referință de partajare nevalidă</translation>
     </message>
     <message>
         <source>Inactive share %1</source>
-        <translation type="unfinished"/>
+        <translation>Ponderea inactivă %1</translation>
     </message>
     <message>
         <source>Imported from %1</source>
@@ -4098,35 +4114,35 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Exported to %1</source>
-        <translation type="unfinished"/>
+        <translation>Exportat la %1</translation>
     </message>
     <message>
         <source>Synchronized with %1</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizat cu %1</translation>
     </message>
     <message>
         <source>Import is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Importul este dezactivat în setări</translation>
     </message>
     <message>
         <source>Export is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Exportul este dezactivat în setări</translation>
     </message>
     <message>
         <source>Inactive share</source>
-        <translation type="unfinished"/>
+        <translation>Ponderea inactivă</translation>
     </message>
     <message>
         <source>Imported from</source>
-        <translation type="unfinished"/>
+        <translation>Importat din</translation>
     </message>
     <message>
         <source>Exported to</source>
-        <translation type="unfinished"/>
+        <translation>Exportat în</translation>
     </message>
     <message>
         <source>Synchronized with</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizat cu</translation>
     </message>
 </context>
 <context>
@@ -4228,11 +4244,11 @@ Mesaj: %2</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea fișierelor cheie</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Căutați fișierul cheie</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -4240,28 +4256,29 @@ Mesaj: %2</translation>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation type="unfinished"/>
+        <translation>Generați un nou fișier cheie</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
+        <translation>Notă: Nu folosiți un fișier care s-ar putea schimba, deoarece acest lucru vă va împiedica să deblocați baza de date!</translation>
     </message>
     <message>
         <source>Invalid Key File</source>
-        <translation type="unfinished"/>
+        <translation>Fișier cheie nevalid</translation>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>Nu puteți utiliza baza de date curentă ca propriul fișier cheie. Vă rugăm să alegeți un alt fișier sau să generați un nou fișier cheie.</translation>
     </message>
     <message>
         <source>Suspicious Key File</source>
-        <translation type="unfinished"/>
+        <translation>Fișier cu cheie suspectă</translation>
     </message>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation type="unfinished"/>
+        <translation>Fișierul cheie ales arată ca un fișier de bază de date cu parolă. Un fișier cheie trebuie să fie un fișier static care nu se schimbă niciodată sau veți pierde accesul la baza de date pentru totdeauna.
+Sigur doriți să continuați cu acest fișier?</translation>
     </message>
 </context>
 <context>
@@ -4556,27 +4573,27 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Export</translation>
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
-        <translation type="unfinished"/>
+        <translation>Verifică pentru a&amp;ctualizări...</translation>
     </message>
     <message>
         <source>Downlo&amp;ad all favicons</source>
-        <translation type="unfinished"/>
+        <translation>Descarc&amp;a toate favicons</translation>
     </message>
     <message>
         <source>Sort &amp;A-Z</source>
-        <translation type="unfinished"/>
+        <translation>Sortare &amp;A-Z</translation>
     </message>
     <message>
         <source>Sort &amp;Z-A</source>
-        <translation type="unfinished"/>
+        <translation>Sortare &amp;Z-A</translation>
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation type="unfinished"/>
+        <translation>Generator de &amp;parolă</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4584,43 +4601,43 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     </message>
     <message>
         <source>&amp;Export to HTML file...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Export în fișier HTML ...</translation>
     </message>
     <message>
         <source>1Password Vault...</source>
-        <translation type="unfinished"/>
+        <translation>1Password Vault...</translation>
     </message>
     <message>
         <source>Import a 1Password Vault</source>
-        <translation type="unfinished"/>
+        <translation>Import 1Password Vault</translation>
     </message>
     <message>
         <source>&amp;Getting Started</source>
-        <translation type="unfinished"/>
+        <translation>Noțiuni de bază</translation>
     </message>
     <message>
         <source>Open Getting Started Guide PDF</source>
-        <translation type="unfinished"/>
+        <translation>Deschideți Ghidul de pornire PDF</translation>
     </message>
     <message>
         <source>&amp;Online Help...</source>
-        <translation type="unfinished"/>
+        <translation>Ajutor &amp;online...</translation>
     </message>
     <message>
         <source>Go to online documentation (opens browser)</source>
-        <translation type="unfinished"/>
+        <translation>Accesați documentația online (deschide browserul)</translation>
     </message>
     <message>
         <source>&amp;User Guide</source>
-        <translation type="unfinished"/>
+        <translation>Manualul &amp;utilizatorului</translation>
     </message>
     <message>
         <source>Open User Guide PDF</source>
-        <translation type="unfinished"/>
+        <translation>Deschideți Ghidul utilizatorului PDF</translation>
     </message>
     <message>
         <source>&amp;Keyboard Shortcuts</source>
-        <translation type="unfinished"/>
+        <translation>comenzi rapide de la tastatură</translation>
     </message>
 </context>
 <context>
@@ -4683,11 +4700,11 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     </message>
     <message>
         <source>Removed custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Șters date personalizate %1 [%2]</translation>
     </message>
     <message>
         <source>Adding custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Adăugarea de date personalizate %1 [%2]</translation>
     </message>
 </context>
 <context>
@@ -4762,31 +4779,31 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     <name>OpData01</name>
     <message>
         <source>Invalid OpData01, does not contain header</source>
-        <translation type="unfinished"/>
+        <translation>OpData01 nevalid, nu conține antet</translation>
     </message>
     <message>
         <source>Unable to read all IV bytes, wanted 16 but got %1</source>
-        <translation type="unfinished"/>
+        <translation>Nu a putut citi toate octeții IV, a dorit 16, dar a primit %1</translation>
     </message>
     <message>
         <source>Unable to init cipher for opdata01: %1</source>
-        <translation type="unfinished"/>
+        <translation>Imposibil de inițiat cifrarea pentru opdata01: %1</translation>
     </message>
     <message>
         <source>Unable to read all HMAC signature bytes</source>
-        <translation type="unfinished"/>
+        <translation>Imposibil de citit toți octeții de semnătură HMAC</translation>
     </message>
     <message>
         <source>Malformed OpData01 due to a failed HMAC</source>
-        <translation type="unfinished"/>
+        <translation>OpData01 defectuos din cauza unei HMAC eșuate</translation>
     </message>
     <message>
         <source>Unable to process clearText in place</source>
-        <translation type="unfinished"/>
+        <translation>Imposibil de procesat clearText în loc</translation>
     </message>
     <message>
         <source>Expected %1 bytes of clear-text, found %2</source>
-        <translation type="unfinished"/>
+        <translation>Se așteaptă %1 octeți de text clar, %2 găsit</translation>
     </message>
 </context>
 <context>
@@ -4794,34 +4811,35 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     <message>
         <source>Read Database did not produce an instance
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Citirea bazei de date nu a produs o instanță
+%1</translation>
     </message>
 </context>
 <context>
     <name>OpVaultReader</name>
     <message>
         <source>Directory .opvault must exist</source>
-        <translation type="unfinished"/>
+        <translation>Directory .opvault trebuie să existe</translation>
     </message>
     <message>
         <source>Directory .opvault must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Directory .opvault trebuie să fie lizibil</translation>
     </message>
     <message>
         <source>Directory .opvault/default must exist</source>
-        <translation type="unfinished"/>
+        <translation>Directory .opvault / default trebuie să existe</translation>
     </message>
     <message>
         <source>Directory .opvault/default must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Directorul .opvault / default trebuie să fie lizibil</translation>
     </message>
     <message>
         <source>Unable to decode masterKey: %1</source>
-        <translation type="unfinished"/>
+        <translation>Imposibil de decodat masterKey: %1</translation>
     </message>
     <message>
         <source>Unable to derive master key: %1</source>
-        <translation type="unfinished"/>
+        <translation>Nu se poate derula cheia principală: %1</translation>
     </message>
 </context>
 <context>
@@ -4927,11 +4945,11 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     <name>PasswordEdit</name>
     <message>
         <source>Passwords do not match</source>
-        <translation type="unfinished"/>
+        <translation>parolele nu se potrivesc</translation>
     </message>
     <message>
         <source>Passwords match so far</source>
-        <translation type="unfinished"/>
+        <translation>Parolele se potrivesc până acum</translation>
     </message>
 </context>
 <context>
@@ -4962,19 +4980,19 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp parola</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Comutați vizibilitatea parolelor</translation>
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Repetați câmpul de parolă</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Comutați generatorul de parolă</translation>
     </message>
 </context>
 <context>
@@ -5178,71 +5196,71 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     </message>
     <message>
         <source>Generated password</source>
-        <translation type="unfinished"/>
+        <translation>Parol generat</translation>
     </message>
     <message>
         <source>Upper-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Litere mari</translation>
     </message>
     <message>
         <source>Lower-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Litere mici</translation>
     </message>
     <message>
         <source>Special characters</source>
-        <translation type="unfinished"/>
+        <translation>Personaje speciale</translation>
     </message>
     <message>
         <source>Math Symbols</source>
-        <translation type="unfinished"/>
+        <translation>Simboluri matematice</translation>
     </message>
     <message>
         <source>Dashes and Slashes</source>
-        <translation type="unfinished"/>
+        <translation>Dashes și Slashes</translation>
     </message>
     <message>
         <source>Excluded characters</source>
-        <translation type="unfinished"/>
+        <translation>Personaje excluse</translation>
     </message>
     <message>
         <source>Hex Passwords</source>
-        <translation type="unfinished"/>
+        <translation>Parole hex</translation>
     </message>
     <message>
         <source>Password length</source>
-        <translation type="unfinished"/>
+        <translation>Lungimea parolei</translation>
     </message>
     <message>
         <source>Word Case:</source>
-        <translation type="unfinished"/>
+        <translation>Registrul cuvântelor</translation>
     </message>
     <message>
         <source>Regenerate password</source>
-        <translation type="unfinished"/>
+        <translation>Regenerați parola</translation>
     </message>
     <message>
         <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>Copiază parola</translation>
     </message>
     <message>
         <source>Accept password</source>
-        <translation type="unfinished"/>
+        <translation>Acceptați parola</translation>
     </message>
     <message>
         <source>lower case</source>
-        <translation type="unfinished"/>
+        <translation>minuscule</translation>
     </message>
     <message>
         <source>UPPER CASE</source>
-        <translation type="unfinished"/>
+        <translation>MAJUSCULE</translation>
     </message>
     <message>
         <source>Title Case</source>
-        <translation type="unfinished"/>
+        <translation>registrul antetului</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Comutați vizibilitatea parolelor</translation>
     </message>
 </context>
 <context>
@@ -5253,7 +5271,7 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     </message>
     <message>
         <source>Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Statistici</translation>
     </message>
 </context>
 <context>
@@ -5292,7 +5310,7 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"/>
+        <translation>Continua</translation>
     </message>
 </context>
 <context>
@@ -5987,23 +6005,23 @@ Comenzi disponibile:
     </message>
     <message>
         <source>Deactivate password key for the database.</source>
-        <translation type="unfinished"/>
+        <translation>Dezactivați cheia parolă pentru baza de date.</translation>
     </message>
     <message>
         <source>Displays debugging information.</source>
-        <translation type="unfinished"/>
+        <translation>Afișează informații de depanare.</translation>
     </message>
     <message>
         <source>Deactivate password key for the database to merge from.</source>
-        <translation type="unfinished"/>
+        <translation>Dezactivați cheia parolă pentru care se bazează baza de date.</translation>
     </message>
     <message>
         <source>Version %1</source>
-        <translation type="unfinished"/>
+        <translation>Versiunea %1</translation>
     </message>
     <message>
         <source>Build Type: %1</source>
-        <translation type="unfinished"/>
+        <translation>Tip de construcție: %1</translation>
     </message>
     <message>
         <source>Revision: %1</source>
@@ -6015,11 +6033,11 @@ Comenzi disponibile:
     </message>
     <message>
         <source>Debugging mode is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Modul de depanare este dezactivat.</translation>
     </message>
     <message>
         <source>Debugging mode is enabled.</source>
-        <translation type="unfinished"/>
+        <translation>Modul de depanare este activat.</translation>
     </message>
     <message>
         <source>Operating system: %1
@@ -6035,27 +6053,27 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>KeeShare (signed and unsigned sharing)</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare (partajare semnată și nesemnată)</translation>
     </message>
     <message>
         <source>KeeShare (only signed sharing)</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare (doar partajare semnată)</translation>
     </message>
     <message>
         <source>KeeShare (only unsigned sharing)</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare (doar partajare nesemnată)</translation>
     </message>
     <message>
         <source>YubiKey</source>
-        <translation type="unfinished"/>
+        <translation>YubiKey</translation>
     </message>
     <message>
         <source>TouchID</source>
-        <translation type="unfinished"/>
+        <translation>TouchID</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"/>
+        <translation>Nici unul</translation>
     </message>
     <message>
         <source>Enabled extensions:</source>
@@ -6063,151 +6081,151 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Cryptographic libraries:</source>
-        <translation type="unfinished"/>
+        <translation>Biblioteci criptografice:</translation>
     </message>
     <message>
         <source>Cannot generate a password and prompt at the same time!</source>
-        <translation type="unfinished"/>
+        <translation>Nu se poate genera o parolă și o solicitare în același timp!</translation>
     </message>
     <message>
         <source>Adds a new group to a database.</source>
-        <translation type="unfinished"/>
+        <translation>Adaugă un grup nou la o bază de date.</translation>
     </message>
     <message>
         <source>Path of the group to add.</source>
-        <translation type="unfinished"/>
+        <translation>Calea grupului de adăugat.</translation>
     </message>
     <message>
         <source>Group %1 already exists!</source>
-        <translation type="unfinished"/>
+        <translation>Grupul %1 există deja!</translation>
     </message>
     <message>
         <source>Group %1 not found.</source>
-        <translation type="unfinished"/>
+        <translation>Grupul %1 nu a fost găsit.</translation>
     </message>
     <message>
         <source>Successfully added group %1.</source>
-        <translation type="unfinished"/>
+        <translation>A adăugat cu succes grupul %1.</translation>
     </message>
     <message>
         <source>Check if any passwords have been publicly leaked. FILENAME must be the path of a file listing SHA-1 hashes of leaked passwords in HIBP format, as available from https://haveibeenpwned.com/Passwords.</source>
-        <translation type="unfinished"/>
+        <translation>Verificați dacă au fost scurse parole în mod public. FILENAME trebuie să fie calea unui fișier care să enumeze hash-urile SHA-1 ale parolelor scurse în format HIBP, așa cum este disponibil pe https://haveibeenpwned.com/Passwords.</translation>
     </message>
     <message>
         <source>FILENAME</source>
-        <translation type="unfinished"/>
+        <translation>NUME DE FIȘIER</translation>
     </message>
     <message>
         <source>Analyze passwords for weaknesses and problems.</source>
-        <translation type="unfinished"/>
+        <translation>Analizați parolele pentru deficiențe și probleme.</translation>
     </message>
     <message>
         <source>Failed to open HIBP file %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Nu a putut fi deschis fișierul HIBP %1: %2</translation>
     </message>
     <message>
         <source>Evaluating database entries against HIBP file, this will take a while...</source>
-        <translation type="unfinished"/>
+        <translation>Evaluarea intrărilor din baza de date cu fișierul HIBP, va dura puțin ...</translation>
     </message>
     <message>
         <source>Close the currently opened database.</source>
-        <translation type="unfinished"/>
+        <translation>Închideți baza de date deschisă în prezent.</translation>
     </message>
     <message>
         <source>Display this help.</source>
-        <translation type="unfinished"/>
+        <translation>Afișați acest ajutor.</translation>
     </message>
     <message>
         <source>Yubikey slot used to encrypt the database.</source>
-        <translation type="unfinished"/>
+        <translation>Slot Yubikey utilizat pentru criptarea bazei de date.</translation>
     </message>
     <message>
         <source>slot</source>
-        <translation type="unfinished"/>
+        <translation>slot</translation>
     </message>
     <message>
         <source>Invalid word count %1</source>
-        <translation type="unfinished"/>
+        <translation>Număr de cuvinte nevalide %1</translation>
     </message>
     <message>
         <source>The word list is too small (&lt; 1000 items)</source>
-        <translation type="unfinished"/>
+        <translation>Lista de cuvinte este prea mică (&lt;1000 de articole)</translation>
     </message>
     <message>
         <source>Exit interactive mode.</source>
-        <translation type="unfinished"/>
+        <translation>Ieșiți din modul interactiv.</translation>
     </message>
     <message>
         <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
-        <translation type="unfinished"/>
+        <translation>Formatul de utilizat la export. Opțiunile disponibile sunt xml sau csv. Valori implicite la xml.</translation>
     </message>
     <message>
         <source>Exports the content of a database to standard output in the specified format.</source>
-        <translation type="unfinished"/>
+        <translation>Exportă conținutul unei baze de date până la ieșirea standard în formatul specificat.</translation>
     </message>
     <message>
         <source>Unable to export database to XML: %1</source>
-        <translation type="unfinished"/>
+        <translation>Imposibil de exportat baza de date în XML: %1</translation>
     </message>
     <message>
         <source>Unsupported format %1</source>
-        <translation type="unfinished"/>
+        <translation>Formatul neacceptat %1</translation>
     </message>
     <message>
         <source>Use numbers</source>
-        <translation type="unfinished"/>
+        <translation>Folosiți numere</translation>
     </message>
     <message>
         <source>Invalid password length %1</source>
-        <translation type="unfinished"/>
+        <translation>Lungime parolă nevalidă %1</translation>
     </message>
     <message>
         <source>Display command help.</source>
-        <translation type="unfinished"/>
+        <translation>Afișați ajutorul comenzii.</translation>
     </message>
     <message>
         <source>Available commands:</source>
-        <translation type="unfinished"/>
+        <translation>Comenzi disponibile:</translation>
     </message>
     <message>
         <source>Import the contents of an XML database.</source>
-        <translation type="unfinished"/>
+        <translation>Importați conținutul unei baze de date XML.</translation>
     </message>
     <message>
         <source>Path of the XML database export.</source>
-        <translation type="unfinished"/>
+        <translation>Calea de export a bazei de date XML.</translation>
     </message>
     <message>
         <source>Path of the new database.</source>
-        <translation type="unfinished"/>
+        <translation>Calea noii baze de date.</translation>
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
-        <translation type="unfinished"/>
+        <translation>Imposibil de importat baza de date XML export %1</translation>
     </message>
     <message>
         <source>Successfully imported database.</source>
-        <translation type="unfinished"/>
+        <translation>Baza de date importată cu succes.</translation>
     </message>
     <message>
         <source>Unknown command %1</source>
-        <translation type="unfinished"/>
+        <translation>Comanda necunoscută %1</translation>
     </message>
     <message>
         <source>Flattens the output to single lines.</source>
-        <translation type="unfinished"/>
+        <translation>Aplica ieșirea pe linii unice.</translation>
     </message>
     <message>
         <source>Only print the changes detected by the merge operation.</source>
-        <translation type="unfinished"/>
+        <translation>Tipăriți numai modificările detectate de operația de îmbinare.</translation>
     </message>
     <message>
         <source>Yubikey slot for the second database.</source>
-        <translation type="unfinished"/>
+        <translation>Slot Yubikey pentru a doua bază de date.</translation>
     </message>
     <message>
         <source>Successfully merged %1 into %2.</source>
-        <translation type="unfinished"/>
+        <translation>Fuzionarea cu succes %1 în %2.</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
@@ -6215,103 +6233,103 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Moves an entry to a new group.</source>
-        <translation type="unfinished"/>
+        <translation>Mută ​​o intrare într-un grup nou.</translation>
     </message>
     <message>
         <source>Path of the entry to move.</source>
-        <translation type="unfinished"/>
+        <translation>Calea de intrare pentru a vă deplasa.</translation>
     </message>
     <message>
         <source>Path of the destination group.</source>
-        <translation type="unfinished"/>
+        <translation>Calea grupului de destinație.</translation>
     </message>
     <message>
         <source>Could not find group with path %1.</source>
-        <translation type="unfinished"/>
+        <translation>Nu s-a putut găsi grupul cu calea% 1.</translation>
     </message>
     <message>
         <source>Entry is already in group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Intrarea este deja în grupul %1.</translation>
     </message>
     <message>
         <source>Successfully moved entry %1 to group %2.</source>
-        <translation type="unfinished"/>
+        <translation>Mutați cu succes intrarea %1 în grupul %2.</translation>
     </message>
     <message>
         <source>Open a database.</source>
-        <translation type="unfinished"/>
+        <translation>Deschideți o bază de date.</translation>
     </message>
     <message>
         <source>Path of the group to remove.</source>
-        <translation type="unfinished"/>
+        <translation>Calea grupului de eliminat.</translation>
     </message>
     <message>
         <source>Cannot remove root group from database.</source>
-        <translation type="unfinished"/>
+        <translation>Nu se poate elimina grupul rădăcină din baza de date.</translation>
     </message>
     <message>
         <source>Successfully recycled group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Grup reciclat cu succes %1.</translation>
     </message>
     <message>
         <source>Successfully deleted group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Grupul %1 a fost șters cu succes.</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not found</source>
-        <translation type="unfinished"/>
+        <translation>Nu a putut fi deschis fișierul bazei de date %1: nu a fost găsit</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not a plain file</source>
-        <translation type="unfinished"/>
+        <translation>Nu a putut deschide fișierul bazei de date %1: nu un fișier simplu</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not readable</source>
-        <translation type="unfinished"/>
+        <translation>Nu a putut deschide fișierul bazei de date %1: nu poate fi citit</translation>
     </message>
     <message>
         <source>Enter password to unlock %1: </source>
-        <translation type="unfinished"/>
+        <translation>Introduceți parola pentru a debloca %1:</translation>
     </message>
     <message>
         <source>Invalid YubiKey slot %1</source>
-        <translation type="unfinished"/>
+        <translation>Slot YubiKey %1 nevalid</translation>
     </message>
     <message>
         <source>Please touch the button on your YubiKey to unlock %1</source>
-        <translation type="unfinished"/>
+        <translation>Vă rugăm să atingeți butonul de pe YubiKey pentru a debloca %1</translation>
     </message>
     <message>
         <source>Enter password to encrypt database (optional): </source>
-        <translation type="unfinished"/>
+        <translation>Introduceți parola pentru criptarea bazei de date (opțional):</translation>
     </message>
     <message>
         <source>HIBP file, line %1: parse error</source>
-        <translation type="unfinished"/>
+        <translation>Fișier HIBP, linia %1: eroare de analiză</translation>
     </message>
     <message>
         <source>Secret Service Integration</source>
-        <translation type="unfinished"/>
+        <translation>Integrarea serviciilor secrete</translation>
     </message>
     <message>
         <source>User name</source>
-        <translation type="unfinished"/>
+        <translation>Nume utilizator</translation>
     </message>
     <message>
         <source>%1[%2] Challenge Response - Slot %3 - %4</source>
-        <translation type="unfinished"/>
+        <translation>%1[%2] Răspuns la provocare - slot %3 - %4</translation>
     </message>
     <message numerus="yes">
         <source>Password for &apos;%1&apos; has been leaked %2 time(s)!</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Parola pentru „%1” a fost scursă de 2% ori!</numerusform><numerusform>Parola pentru „%1” a fost scursă de 2% ori!</numerusform><numerusform>Parola pentru „%1” a fost scursă de 2% ori!</numerusform></translation>
     </message>
     <message>
         <source>Invalid password generator after applying all options</source>
-        <translation type="unfinished"/>
+        <translation>Generator de parole nevalide după aplicarea tuturor opțiunilor</translation>
     </message>
     <message>
         <source>Show the protected attributes in clear text.</source>
-        <translation type="unfinished"/>
+        <translation>Afișează atributele protejate într-un text clar.</translation>
     </message>
 </context>
 <context>
@@ -6470,11 +6488,11 @@ Nucleu (Kernel): %3 %4</translation>
     <name>SettingsWidgetFdoSecrets</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"/>
+        <translation>Opțiuni</translation>
     </message>
     <message>
         <source>Enable KeepassXC Freedesktop.org Secret Service integration</source>
-        <translation type="unfinished"/>
+        <translation>Activați integrarea KeepassXC Freedesktop.org Serviciu secret</translation>
     </message>
     <message>
         <source>General</source>
@@ -6482,23 +6500,23 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Show notification when credentials are requested</source>
-        <translation type="unfinished"/>
+        <translation>Afișați notificarea atunci când sunt solicitate acreditările</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;În cazul în care coșul de reciclare este activat pentru baza de date, intrările vor fi mutate direct la coșul de gunoi. În caz contrar, acestea vor fi șterse fără confirmare.&lt;/p&gt;&lt;p&gt; Vi se va solicita totuși dacă orice alte înregistrări sunt trimise de către alții.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation type="unfinished"/>
+        <translation>Nu confirmați când înregistrările sunt șterse de către clienți.</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
-        <translation type="unfinished"/>
+        <translation>Grupuri de baze de date expuse:</translation>
     </message>
     <message>
         <source>File Name</source>
-        <translation type="unfinished"/>
+        <translation>Nume de fișier</translation>
     </message>
     <message>
         <source>Group</source>
@@ -6506,23 +6524,23 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation type="unfinished"/>
+        <translation>Administra</translation>
     </message>
     <message>
         <source>Authorization</source>
-        <translation type="unfinished"/>
+        <translation>Autorizare</translation>
     </message>
     <message>
         <source>These applications are currently connected:</source>
-        <translation type="unfinished"/>
+        <translation>Aceste aplicații sunt conectate în prezent:</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished"/>
+        <translation>Aplicaţie</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"/>
+        <translation>Deconecta</translation>
     </message>
     <message>
         <source>Database settings</source>
@@ -6530,7 +6548,7 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Edit database settings</source>
-        <translation type="unfinished"/>
+        <translation>Editați setările bazei de date</translation>
     </message>
     <message>
         <source>Unlock database</source>
@@ -6538,7 +6556,7 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Unlock database to show more information</source>
-        <translation type="unfinished"/>
+        <translation>Deblocați baza de date pentru a afișa mai multe informații</translation>
     </message>
     <message>
         <source>Lock database</source>
@@ -6546,11 +6564,11 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Unlock to show</source>
-        <translation type="unfinished"/>
+        <translation>Deblocați să afișați</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"/>
+        <translation>Nici unul</translation>
     </message>
 </context>
 <context>
@@ -6678,15 +6696,15 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Allow KeeShare imports</source>
-        <translation type="unfinished"/>
+        <translation>Permite importurile KeeShare</translation>
     </message>
     <message>
         <source>Allow KeeShare exports</source>
-        <translation type="unfinished"/>
+        <translation>Permite exporturile KeeShare</translation>
     </message>
     <message>
         <source>Only show warnings and errors</source>
-        <translation type="unfinished"/>
+        <translation>Afișați doar avertismente și erori</translation>
     </message>
     <message>
         <source>Key</source>
@@ -6694,39 +6712,39 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Signer name field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul nume semnatar</translation>
     </message>
     <message>
         <source>Generate new certificate</source>
-        <translation type="unfinished"/>
+        <translation>Generați un nou certificat</translation>
     </message>
     <message>
         <source>Import existing certificate</source>
-        <translation type="unfinished"/>
+        <translation>Importați certificatul existent</translation>
     </message>
     <message>
         <source>Export own certificate</source>
-        <translation type="unfinished"/>
+        <translation>Export certificat propriu</translation>
     </message>
     <message>
         <source>Known shares</source>
-        <translation type="unfinished"/>
+        <translation>Acțiuni cunoscute</translation>
     </message>
     <message>
         <source>Trust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Certificat selectat de încredere</translation>
     </message>
     <message>
         <source>Ask whether to trust the selected certificate every time</source>
-        <translation type="unfinished"/>
+        <translation>Întrebați dacă aveți încredere în certificatul selectat de fiecare dată</translation>
     </message>
     <message>
         <source>Untrust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Certificat selectat neîncredere</translation>
     </message>
     <message>
         <source>Remove selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Ștergeți certificatul selectat</translation>
     </message>
 </context>
 <context>
@@ -6954,15 +6972,15 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Secret Key:</source>
-        <translation type="unfinished"/>
+        <translation>Cheie secreta:</translation>
     </message>
     <message>
         <source>Secret key must be in Base32 format</source>
-        <translation type="unfinished"/>
+        <translation>Cheia secretă trebuie să fie în format Base32</translation>
     </message>
     <message>
         <source>Secret key field</source>
-        <translation type="unfinished"/>
+        <translation>Câmpul cu cheie secretă</translation>
     </message>
     <message>
         <source>Algorithm:</source>
@@ -6970,28 +6988,29 @@ Nucleu (Kernel): %3 %4</translation>
     </message>
     <message>
         <source>Time step field</source>
-        <translation type="unfinished"/>
+        <translation>Câmp pas cu timp</translation>
     </message>
     <message>
         <source> digits</source>
-        <translation type="unfinished"/>
+        <translation>cifre</translation>
     </message>
     <message>
         <source>Invalid TOTP Secret</source>
-        <translation type="unfinished"/>
+        <translation>Secret TOTP nevalid</translation>
     </message>
     <message>
         <source>You have entered an invalid secret key. The key must be in Base32 format.
 Example: JBSWY3DPEHPK3PXP</source>
-        <translation type="unfinished"/>
+        <translation>Ați introdus o cheie secretă nevalidă. Cheia trebuie să fie în format Base32.
+Exemplu: JBSWY3DPEHPK3PXP</translation>
     </message>
     <message>
         <source>Confirm Remove TOTP Settings</source>
-        <translation type="unfinished"/>
+        <translation>Confirmați Eliminarea setărilor TOTP</translation>
     </message>
     <message>
         <source>Are you sure you want to delete TOTP settings for this entry?</source>
-        <translation type="unfinished"/>
+        <translation>Sigur doriți să ștergeți setările TOTP pentru această intrare?</translation>
     </message>
 </context>
 <context>
@@ -7077,11 +7096,11 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Importă de la 1Password</translation>
     </message>
     <message>
         <source>Open a recent database</source>
-        <translation type="unfinished"/>
+        <translation>Deschideți o bază de date recentă</translation>
     </message>
 </context>
 <context>
@@ -7108,11 +7127,11 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Actualizați jetoane hardware</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Selectarea sloturilor pentru cheie hardware</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_ru.ts b/share/translations/keepassx_ru.ts
index 2cbec38f8a..7fb0495bd4 100644
--- a/share/translations/keepassx_ru.ts
+++ b/share/translations/keepassx_ru.ts
@@ -101,7 +101,7 @@
     </message>
     <message>
         <source>Are you sure you want to reset all general and security settings to default?</source>
-        <translation>Вы уверены, что вы хотите сбросить по умолчанию все общие настройки и настройки безопасности? </translation>
+        <translation>Действительно сбросить все общие параметры и параметры безопасности к значениям, заданным по умолчанию? </translation>
     </message>
 </context>
 <context>
@@ -325,7 +325,7 @@
     </message>
     <message>
         <source>Clear clipboard after</source>
-        <translation>Задержка очистки поискового запроса:</translation>
+        <translation>Задержка очистки буфера обмена:</translation>
     </message>
     <message>
         <source> sec</source>
@@ -382,7 +382,7 @@
     </message>
     <message>
         <source>Hide entry notes by default</source>
-        <translation>Скрывать заметки по умолчанию</translation>
+        <translation>Не показывать текст заметкок </translation>
     </message>
     <message>
         <source>Privacy</source>
@@ -521,7 +521,7 @@
     </message>
     <message>
         <source>Search...</source>
-        <translation>Поиск...</translation>
+        <translation>Поиск…</translation>
     </message>
 </context>
 <context>
@@ -640,12 +640,12 @@ Please select the correct database for saving credentials.</source>
     <message>
         <source>Sort &amp;matching credentials by title</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Сортировать &amp;подходящие учётные данные по названию</translation>
+        <translation>Сортировать возвращаемые данные по &amp;названию</translation>
     </message>
     <message>
         <source>Sort matching credentials by &amp;username</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Сортировать по &amp;имени пользователя</translation>
+        <translation>Сортировать возвращаемые данные по &amp;имени пользователя</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -654,17 +654,17 @@ Please select the correct database for saving credentials.</source>
     <message>
         <source>Never &amp;ask before accessing credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Никогда не &amp;спрашивать перед доступом к учётным данным</translation>
+        <translation>Не подтверждать &amp;доступ к записям</translation>
     </message>
     <message>
         <source>Never ask before &amp;updating credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Никогда не спрашивать перед &amp;обновлением учётных данных</translation>
+        <translation>Не подтверждать &amp;обновление записей</translation>
     </message>
     <message>
         <source>Searc&amp;h in all opened databases for matching credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>&amp;Поиск во всех открытых базах для сопоставления учётных данных</translation>
+        <translation>Искать во &amp;всех открытых базах</translation>
     </message>
     <message>
         <source>Automatically creating or updating string fields is not supported.</source>
@@ -688,7 +688,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
-        <translation>Использование &amp;прокси-приложения между KeePassXC и расширением браузера</translation>
+        <translation>Использовать &amp;прокси-приложение между KeePassXC и расширением браузера</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
@@ -697,12 +697,12 @@ Please select the correct database for saving credentials.</source>
     <message>
         <source>Use a &amp;custom proxy location</source>
         <comment>Meant is the proxy for KeePassXC-Browser</comment>
-        <translation>Использовать &amp;пользовательское местоположение прокси</translation>
+        <translation>Задать &amp;своё расположение прокси</translation>
     </message>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation>Обзор...</translation>
+        <translation>Обзор…</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
@@ -739,7 +739,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2. %3</source>
-        <translation>Для интеграции с браузерами требуется KeePassXC-Browser. &lt;br /&gt;Скачайте его для %1 и %2. %3</translation>
+        <translation>Для интеграции требуется установить расширение для браузера «KeePassXC-Browser». &lt;br /&gt;Установите его для %1 и %2. %3</translation>
     </message>
     <message>
         <source>&amp;Brave</source>
@@ -751,7 +751,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>&amp;Allow returning expired credentials.</source>
-        <translation>Разрешить возвращать &amp;истёкшие записи</translation>
+        <translation>Возвращать &amp;истёкшие записи</translation>
     </message>
     <message>
         <source>Enable browser integration</source>
@@ -763,7 +763,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>All databases connected to the extension will return matching credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Получать результаты поиска из всех подключённых баз данных</translation>
     </message>
     <message>
         <source>Don&apos;t display the popup suggesting migration of legacy KeePassHTTP settings.</source>
@@ -1129,11 +1129,11 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Select slot...</source>
-        <translation>Выбрать слот...</translation>
+        <translation>Выберите слот…</translation>
     </message>
     <message>
         <source>Unlock KeePassXC Database</source>
-        <translation>Разблокировать базу данных KeePassXC</translation>
+        <translation>Открытие базы данных KeePassXC</translation>
     </message>
     <message>
         <source>Enter Password:</source>
@@ -1157,7 +1157,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Открытие диалога выбора файла-ключа</translation>
+        <translation>Открыть диалога выбора файла-ключа</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1308,7 +1308,7 @@ If you do not have a key file, please leave the field empty.</source>
     <message>
         <source>Do you really want to delete the selected key?
 This may prevent connection to the browser plugin.</source>
-        <translation>Вы действительно хотите удалить выбранный ключ?
+        <translation>Действительно удалить выбранный ключ?
 Это может воспрепятствовать соединению с подключаемым модулем браузера.</translation>
     </message>
     <message>
@@ -1580,19 +1580,19 @@ If you keep this number, your database may be too easy to crack!</source>
     <name>DatabaseSettingsWidgetFdoSecrets</name>
     <message>
         <source>Exposed Entries</source>
-        <translation type="unfinished"/>
+        <translation>Доступ к записям</translation>
     </message>
     <message>
         <source>Don&apos;t e&amp;xpose this database</source>
-        <translation type="unfinished"/>
+        <translation>Не &amp;публиковать эту базу данных</translation>
     </message>
     <message>
         <source>Expose entries &amp;under this group:</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Предоставить доступ к записям выбранной группы:</translation>
     </message>
     <message>
         <source>Enable fd.o Secret Service to access these settings.</source>
-        <translation type="unfinished"/>
+        <translation>Для доступа к этим параметрам включите службу Secret Service.</translation>
     </message>
 </context>
 <context>
@@ -1774,7 +1774,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Hover over lines with error icons for further information.</source>
-        <translation type="unfinished"/>
+        <translation>Для получения дополнительной информации наведите курсор мыши на строки, содержащие значок ошибки.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1958,7 +1958,7 @@ This is definitely a bug, please report it to the developers.</source>
     </message>
     <message>
         <source>Failed to open %1. It either does not exist or is not accessible.</source>
-        <translation type="unfinished"/>
+        <translation>Не удалось открыть «%1», файл не существует или недоступен.</translation>
     </message>
     <message>
         <source>Export database to HTML file</source>
@@ -2222,7 +2222,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Edit entry</source>
-        <translation>Редактировать запись</translation>
+        <translation>Редактирование записи</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
@@ -2262,7 +2262,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Entry has unsaved changes</source>
-        <translation>В записи есть несохранённые изменения</translation>
+        <translation>Запись содержит несохранённые изменения.</translation>
     </message>
     <message>
         <source>New attribute %1</source>
@@ -2278,7 +2278,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Confirm Removal</source>
-        <translation>Подтвердите удаление</translation>
+        <translation>Подтверждение удаления</translation>
     </message>
     <message>
         <source>Browser Integration</source>
@@ -2408,7 +2408,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Open Auto-Type help webpage</source>
-        <translation type="unfinished"/>
+        <translation>Открыть страницу справки по авто-вводу</translation>
     </message>
     <message>
         <source>Existing window associations</source>
@@ -2685,7 +2685,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
-        <translation type="unfinished"/>
+        <translation>Убрать ключ из агента по истечению заданного интервала времени</translation>
     </message>
     <message>
         <source>Browser for key file</source>
@@ -2763,7 +2763,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Inactive</source>
-        <translation>Неактивные</translation>
+        <translation>Не участвует в обмене</translation>
     </message>
     <message>
         <source>KeeShare unsigned container</source>
@@ -2791,32 +2791,32 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Import</source>
-        <translation>Импортировать</translation>
+        <translation>Импортируется</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation>Экспортировать</translation>
+        <translation>Экспортируется</translation>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation>Синхронизировать</translation>
+        <translation>Синхронизируется</translation>
     </message>
     <message>
         <source>Your KeePassXC version does not support sharing this container type.
 Supported extensions are: %1.</source>
-        <translation type="unfinished"/>
+        <translation>Установленная версия KeePassXC не поддерживает совместное использование контейнера такого типа. Список поддерживаемых расширений: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 уже экспортируется этой базой данных.</translation>
     </message>
     <message>
         <source>%1 is already being imported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 уже импортируется этой базой данных.</translation>
     </message>
     <message>
         <source>%1 is being imported and exported by different groups in this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 уже экспортируется и импортируется различными группами этой базы данных.</translation>
     </message>
     <message>
         <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
@@ -2833,15 +2833,15 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Sharing mode field</source>
-        <translation type="unfinished"/>
+        <translation>Поле состояния общего доступа</translation>
     </message>
     <message>
         <source>Path to share file field</source>
-        <translation type="unfinished"/>
+        <translation>Поле пути к общему файлу</translation>
     </message>
     <message>
         <source>Browser for share file</source>
-        <translation type="unfinished"/>
+        <translation>Запуск диалога открытия общего файла</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -3038,7 +3038,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Plugin Data</source>
-        <translation>Данные подключаемых модулей</translation>
+        <translation>Данные подключаемого модуля браузера</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -3046,13 +3046,13 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Delete plugin data?</source>
-        <translation>Удалить данные подключаемых модулей?</translation>
+        <translation>Удалить данные подключаемого модуля браузера?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected plugin data?
 This may cause the affected plugins to malfunction.</source>
-        <translation>Действительно удалить выбранные данные подключаемых модулей?
-Это действие может привести к неработоспособности подключаемых модулей.</translation>
+        <translation>Действительно удалить выбранные данные подключаемого модуля?
+Это действие может привести к неработоспособности подключаемых модулей в браузерах.</translation>
     </message>
     <message>
         <source>Key</source>
@@ -3064,15 +3064,15 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Datetime created</source>
-        <translation type="unfinished"/>
+        <translation>Дата и время создания</translation>
     </message>
     <message>
         <source>Datetime modified</source>
-        <translation type="unfinished"/>
+        <translation>Дата и время изменения</translation>
     </message>
     <message>
         <source>Datetime accessed</source>
-        <translation type="unfinished"/>
+        <translation>Дата и время последнего использования</translation>
     </message>
     <message>
         <source>Unique ID</source>
@@ -3080,11 +3080,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Данные подключаемого модуля </translation>
     </message>
     <message>
         <source>Remove selected plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Удаление выбранных данных подключаемого модуля браузера</translation>
     </message>
 </context>
 <context>
@@ -3133,7 +3133,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation><numerusform>Вы уверены, что вы хотите удалить %n вложение?</numerusform><numerusform>Вы уверены, что вы хотите удалить %n вложения?</numerusform><numerusform>Вы уверены, что вы хотите удалить %n вложений?</numerusform><numerusform>Вы действительно хотите удалить вложения (%n шт.)?</numerusform></translation>
+        <translation><numerusform>Действительно удалить это вложение?</numerusform><numerusform>Действительно удалить %n вложения?</numerusform><numerusform>Действительно удалить %n вложений?</numerusform><numerusform>Действительно удалить %n вложения?</numerusform></translation>
     </message>
     <message>
         <source>Save attachments</source>
@@ -3172,7 +3172,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Confirm remove</source>
-        <translation>Подтвердите удаление</translation>
+        <translation>Подтверждение удаления</translation>
     </message>
     <message numerus="yes">
         <source>Unable to open file(s):
@@ -3189,19 +3189,19 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Add new attachment</source>
-        <translation type="unfinished"/>
+        <translation>Добавить вложение</translation>
     </message>
     <message>
         <source>Remove selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Удалить выбранное вложение</translation>
     </message>
     <message>
         <source>Open selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Открыть выбранное вложение</translation>
     </message>
     <message>
         <source>Save selected attachment to disk</source>
-        <translation type="unfinished"/>
+        <translation>Сохранить выбранное вложение на диск</translation>
     </message>
 </context>
 <context>
@@ -3379,7 +3379,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Share</source>
-        <translation>Предоставить общий доступ</translation>
+        <translation>Общий файл</translation>
     </message>
     <message>
         <source>Display current TOTP value</source>
@@ -3444,7 +3444,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>FdoSecretsPlugin</name>
     <message>
         <source>Fdo Secret Service: %1</source>
-        <translation type="unfinished"/>
+        <translation>FDO Secret Service: %1</translation>
     </message>
 </context>
 <context>
@@ -3470,7 +3470,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation>Загрузить значки</translation>
+        <translation>Получение значков сайтов</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -3563,7 +3563,8 @@ You can enable the DuckDuckGo website icon service in the security section of th
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Вероятно, для входа были указанные неверные данные.
+Попробуйте ввести данные ещё раз, если ошибка повториться, возможно, файл базы данных повреждён.</translation>
     </message>
 </context>
 <context>
@@ -3698,11 +3699,12 @@ If this reoccurs, then your database file may be corrupt.</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Вероятно, для входа были указанные неверные данные.
+Попробуйте ввести данные ещё раз, если ошибка повториться, возможно, файл базы данных повреждён.</translation>
     </message>
     <message>
         <source>(HMAC mismatch)</source>
-        <translation type="unfinished"/>
+        <translation>(несоответствие HMAC)</translation>
     </message>
 </context>
 <context>
@@ -3931,7 +3933,7 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Import KeePass1 Database</source>
-        <translation type="unfinished"/>
+        <translation>Импортировать базу данных в формате KeePass1</translation>
     </message>
 </context>
 <context>
@@ -4088,18 +4090,19 @@ Line %2, column %3</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Вероятно, для входа были указанные неверные данные.
+Попробуйте ввести данные ещё раз, если ошибка повториться, возможно, файл базы данных повреждён.</translation>
     </message>
 </context>
 <context>
     <name>KeeShare</name>
     <message>
         <source>Invalid sharing reference</source>
-        <translation type="unfinished"/>
+        <translation>Неверная ссылка общего доступа</translation>
     </message>
     <message>
         <source>Inactive share %1</source>
-        <translation type="unfinished"/>
+        <translation>Неактивная общая база %1</translation>
     </message>
     <message>
         <source>Imported from %1</source>
@@ -4107,35 +4110,35 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Exported to %1</source>
-        <translation type="unfinished"/>
+        <translation>Выполнен экспорт в «%1»</translation>
     </message>
     <message>
         <source>Synchronized with %1</source>
-        <translation type="unfinished"/>
+        <translation>Синхронизировано с «%1»</translation>
     </message>
     <message>
         <source>Import is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Возможность импортировать отключена в параметрах программы</translation>
     </message>
     <message>
         <source>Export is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Возможность экспорировать отключена в параметрах программы</translation>
     </message>
     <message>
         <source>Inactive share</source>
-        <translation type="unfinished"/>
+        <translation>Неактивная общая база</translation>
     </message>
     <message>
         <source>Imported from</source>
-        <translation type="unfinished"/>
+        <translation>Импортировано из</translation>
     </message>
     <message>
         <source>Exported to</source>
-        <translation type="unfinished"/>
+        <translation>Экспортировано в</translation>
     </message>
     <message>
         <source>Synchronized with</source>
-        <translation type="unfinished"/>
+        <translation>Синхронизировано с</translation>
     </message>
 </context>
 <context>
@@ -4240,7 +4243,7 @@ Message: %2</source>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Открытие диалога выбора ключевого файла </translation>
+        <translation>Открыть диалога выбора файла-ключа</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -4248,11 +4251,11 @@ Message: %2</source>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation type="unfinished"/>
+        <translation>Создать новый файл ключа</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
+        <translation>Внимание: изменение файла приведёт к невозможности разблокировать базу данных!</translation>
     </message>
     <message>
         <source>Invalid Key File</source>
@@ -4260,7 +4263,7 @@ Message: %2</source>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>Файл базы данных не может быть использован в качестве файла-ключа. Выберите другой файл или создайте файл-ключ.</translation>
     </message>
     <message>
         <source>Suspicious Key File</source>
@@ -4269,7 +4272,8 @@ Message: %2</source>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation type="unfinished"/>
+        <translation>Выбранный файл-ключ, вероятно, является файлом базы данных паролей. Файл-ключ должен являться неизменяемым файлом, в противном случае доступ к базе данных будет безвозвратно утерян.
+Продолжить использовать выбранный файл?</translation>
     </message>
 </context>
 <context>
@@ -4564,7 +4568,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation> &amp;Экспорт</translation>
+        <translation>&amp;Экспорт</translation>
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
@@ -4576,15 +4580,15 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Sort &amp;A-Z</source>
-        <translation>Сортировать &amp;A-Z</translation>
+        <translation>Сортировать &amp;А-Я</translation>
     </message>
     <message>
         <source>Sort &amp;Z-A</source>
-        <translation>Сортировать &amp;Z-A</translation>
+        <translation>Сортировать &amp;Я-А</translation>
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation>&amp;Генератор Паролей</translation>
+        <translation>&amp;Генератор паролей</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4620,11 +4624,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>&amp;User Guide</source>
-        <translation>&amp;Руководство Пользователя</translation>
+        <translation>&amp;Руководство пользователя</translation>
     </message>
     <message>
         <source>Open User Guide PDF</source>
-        <translation>Открыть инструкцию пользователя в формате PDF</translation>
+        <translation>Открыть руководство пользователя в формате PDF</translation>
     </message>
     <message>
         <source>&amp;Keyboard Shortcuts</source>
@@ -4691,11 +4695,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Removed custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Пользовательские данные %1 [%2] удалены </translation>
     </message>
     <message>
         <source>Adding custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Добавление пользовательских данные %1 [%2]</translation>
     </message>
 </context>
 <context>
@@ -4770,31 +4774,31 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <name>OpData01</name>
     <message>
         <source>Invalid OpData01, does not contain header</source>
-        <translation type="unfinished"/>
+        <translation>Данные OpData01 не содержат заголовка</translation>
     </message>
     <message>
         <source>Unable to read all IV bytes, wanted 16 but got %1</source>
-        <translation type="unfinished"/>
+        <translation>Невозможно считать все данные вектора инициализации: ожидалось 16 байт, но получено %1 байт</translation>
     </message>
     <message>
         <source>Unable to init cipher for opdata01: %1</source>
-        <translation type="unfinished"/>
+        <translation>Невозможно инициализировать шифрование для данных opdata01: %1</translation>
     </message>
     <message>
         <source>Unable to read all HMAC signature bytes</source>
-        <translation type="unfinished"/>
+        <translation>Не удалось полностью считать данные подписи HMAC</translation>
     </message>
     <message>
         <source>Malformed OpData01 due to a failed HMAC</source>
-        <translation type="unfinished"/>
+        <translation>Повреждённые данные OpData01 по причине неверного HMAC</translation>
     </message>
     <message>
         <source>Unable to process clearText in place</source>
-        <translation type="unfinished"/>
+        <translation>Невозможно обработать простой текст</translation>
     </message>
     <message>
         <source>Expected %1 bytes of clear-text, found %2</source>
-        <translation type="unfinished"/>
+        <translation>Ожидалось %1 байт простого текста, найдено %2</translation>
     </message>
 </context>
 <context>
@@ -4802,26 +4806,27 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <message>
         <source>Read Database did not produce an instance
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Невозможно создать базу данных из прочитанного файла
+%1</translation>
     </message>
 </context>
 <context>
     <name>OpVaultReader</name>
     <message>
         <source>Directory .opvault must exist</source>
-        <translation type="unfinished"/>
+        <translation>Не найден каталог «.opvault»</translation>
     </message>
     <message>
         <source>Directory .opvault must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Каталог «.opvault» не доступен для чтения</translation>
     </message>
     <message>
         <source>Directory .opvault/default must exist</source>
-        <translation type="unfinished"/>
+        <translation>Не найден каталог «.opvault/default»</translation>
     </message>
     <message>
         <source>Directory .opvault/default must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Каталог «.opvault/default» не доступен для чтения</translation>
     </message>
     <message>
         <source>Unable to decode masterKey: %1</source>
@@ -4829,7 +4834,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Unable to derive master key: %1</source>
-        <translation type="unfinished"/>
+        <translation>Не удалось извлечь мастер-ключ: %1</translation>
     </message>
 </context>
 <context>
@@ -4939,7 +4944,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Passwords match so far</source>
-        <translation type="unfinished"/>
+        <translation>Количество совпавших паролей</translation>
     </message>
 </context>
 <context>
@@ -5026,7 +5031,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Pick characters from every group</source>
-        <translation>Подобрать символы из каждой группы</translation>
+        <translation>Использовать символы из каждой группы</translation>
     </message>
     <message>
         <source>&amp;Length:</source>
@@ -5363,7 +5368,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Key file of the database.</source>
-        <translation>Ключевой файл базы данных.</translation>
+        <translation>Файл-ключ базы данных.</translation>
     </message>
     <message>
         <source>path</source>
@@ -5403,7 +5408,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation>Скопировать пароль в буфер обмена.</translation>
+        <translation>Скопировать пароль записи в буфер обмена.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
@@ -5971,7 +5976,7 @@ Available commands:
     </message>
     <message>
         <source>Parent window handle</source>
-        <translation>Дескриптор родительского окна</translation>
+        <translation>Дескриптор родительского окна.</translation>
     </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
@@ -6099,27 +6104,27 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Check if any passwords have been publicly leaked. FILENAME must be the path of a file listing SHA-1 hashes of leaked passwords in HIBP format, as available from https://haveibeenpwned.com/Passwords.</source>
-        <translation type="unfinished"/>
+        <translation>Проверка паролей на компрометацию. Параметр ИМЯ_ФАЙЛА должен быть путём к файлу данных списка SHA-1 хэшей паролей в формате HIBP, полученным, например, с сайта https://haveibeenpwned.com/Passwords.</translation>
     </message>
     <message>
         <source>FILENAME</source>
-        <translation type="unfinished"/>
+        <translation>ИМЯ_ФАЙЛА</translation>
     </message>
     <message>
         <source>Analyze passwords for weaknesses and problems.</source>
-        <translation type="unfinished"/>
+        <translation>Проверка надёжности и других характеристик паролей.</translation>
     </message>
     <message>
         <source>Failed to open HIBP file %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Не удалось открыть файл в формате HIBP %1: %2</translation>
     </message>
     <message>
         <source>Evaluating database entries against HIBP file, this will take a while...</source>
-        <translation type="unfinished"/>
+        <translation>Производится проверка записей базы данных относительно файла в формате HIBP…</translation>
     </message>
     <message>
         <source>Close the currently opened database.</source>
-        <translation type="unfinished"/>
+        <translation>Закрыть текущую базу данных.</translation>
     </message>
     <message>
         <source>Display this help.</source>
@@ -6127,7 +6132,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Yubikey slot used to encrypt the database.</source>
-        <translation type="unfinished"/>
+        <translation>Слот устройства Yubikey, использованный для шифрования базы данных.</translation>
     </message>
     <message>
         <source>slot</source>
@@ -6135,7 +6140,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Invalid word count %1</source>
-        <translation type="unfinished"/>
+        <translation>Количество неверных слов: %1</translation>
     </message>
     <message>
         <source>The word list is too small (&lt; 1000 items)</source>
@@ -6147,15 +6152,15 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
-        <translation type="unfinished"/>
+        <translation>Выбор формата файла для экспорта. Возможные варианты: XML (по умолчанию) или CSV.</translation>
     </message>
     <message>
         <source>Exports the content of a database to standard output in the specified format.</source>
-        <translation type="unfinished"/>
+        <translation>Экспорт базы данных в заданном формате на устройство стандартного вывода.</translation>
     </message>
     <message>
         <source>Unable to export database to XML: %1</source>
-        <translation type="unfinished"/>
+        <translation>Ошибка экспортирования базы данных в формат XML: %1</translation>
     </message>
     <message>
         <source>Unsupported format %1</source>
@@ -6179,11 +6184,11 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Import the contents of an XML database.</source>
-        <translation type="unfinished"/>
+        <translation>Импортировать базу данных в формате XML.</translation>
     </message>
     <message>
         <source>Path of the XML database export.</source>
-        <translation type="unfinished"/>
+        <translation>Путь для экспорта базы данных в формат XML</translation>
     </message>
     <message>
         <source>Path of the new database.</source>
@@ -6191,7 +6196,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
-        <translation type="unfinished"/>
+        <translation>Ошибка импорта базы данных %1 из формата XML</translation>
     </message>
     <message>
         <source>Successfully imported database.</source>
@@ -6207,7 +6212,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Only print the changes detected by the merge operation.</source>
-        <translation type="unfinished"/>
+        <translation>Не выполнять объединение, а только сообщать о найденных изменениях</translation>
     </message>
     <message>
         <source>Yubikey slot for the second database.</source>
@@ -6215,7 +6220,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Successfully merged %1 into %2.</source>
-        <translation type="unfinished"/>
+        <translation>%1 успешно объединён с %2.</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
@@ -6287,15 +6292,15 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Please touch the button on your YubiKey to unlock %1</source>
-        <translation type="unfinished"/>
+        <translation>Для разблокирования %1 нажмите кнопку на устройстве YubiKey</translation>
     </message>
     <message>
         <source>Enter password to encrypt database (optional): </source>
-        <translation type="unfinished"/>
+        <translation>Введите пароль для шифрования базы данных (необязательно):</translation>
     </message>
     <message>
         <source>HIBP file, line %1: parse error</source>
-        <translation type="unfinished"/>
+        <translation>Ошибка разбора строки %1 файла в формате HIBP</translation>
     </message>
     <message>
         <source>Secret Service Integration</source>
@@ -6307,15 +6312,15 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>%1[%2] Challenge Response - Slot %3 - %4</source>
-        <translation type="unfinished"/>
+        <translation>%1 [%2] Вызов-ответ — слот %3 - %4</translation>
     </message>
     <message numerus="yes">
         <source>Password for &apos;%1&apos; has been leaked %2 time(s)!</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Пароль к «%1» был замечен в утечках %2 раз.</numerusform><numerusform>Пароль к «%1» был замечен в утечках %2 раза.</numerusform><numerusform>Пароль к «%1» был замечен в утечках %2 раз.</numerusform><numerusform>Пароль к «%1» был замечен в утечках %2 раза.</numerusform></translation>
     </message>
     <message>
         <source>Invalid password generator after applying all options</source>
-        <translation type="unfinished"/>
+        <translation>Невозможно создать пароль с заданными параметрами</translation>
     </message>
     <message>
         <source>Show the protected attributes in clear text.</source>
@@ -6482,7 +6487,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Enable KeepassXC Freedesktop.org Secret Service integration</source>
-        <translation type="unfinished"/>
+        <translation>Включить интеграцию KeepassXC со службой Freedesktop.org Secret Service</translation>
     </message>
     <message>
         <source>General</source>
@@ -6490,23 +6495,23 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Show notification when credentials are requested</source>
-        <translation type="unfinished"/>
+        <translation>Выводить уведомления при запросе записей</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если в параметрах базы данных разрешено использование корзины, то при удалении записи будут перемещены в неё. В противном случае, будет выполнено необратимое удаление без подтверждения.&lt;/p&gt;&lt;p&gt;В случае, если на удаляемые записи имеются ссылки, потребуется подтверждение удаления.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation type="unfinished"/>
+        <translation>Не подтверждать удаление записей приложениями-клиентами</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
-        <translation type="unfinished"/>
+        <translation>Доступные группы из базы данных:</translation>
     </message>
     <message>
         <source>File Name</source>
-        <translation type="unfinished"/>
+        <translation>Имя файла</translation>
     </message>
     <message>
         <source>Group</source>
@@ -6514,7 +6519,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Manage</source>
-        <translation type="unfinished"/>
+        <translation>Управление</translation>
     </message>
     <message>
         <source>Authorization</source>
@@ -6522,15 +6527,15 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>These applications are currently connected:</source>
-        <translation type="unfinished"/>
+        <translation>Подключены следующие приложения:</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished"/>
+        <translation>Приложение</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"/>
+        <translation>Отключить</translation>
     </message>
     <message>
         <source>Database settings</source>
@@ -6538,7 +6543,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Edit database settings</source>
-        <translation type="unfinished"/>
+        <translation>Редактирование параметров базы данных</translation>
     </message>
     <message>
         <source>Unlock database</source>
@@ -6662,7 +6667,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>KeeShare key file</source>
-        <translation>Ключевой файл KeeShare</translation>
+        <translation>Файл ключа KeeShare</translation>
     </message>
     <message>
         <source>All files</source>
@@ -6962,7 +6967,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Secret Key:</source>
-        <translation>Секретный ключ</translation>
+        <translation>Секретный ключ:</translation>
     </message>
     <message>
         <source>Secret key must be in Base32 format</source>
diff --git a/share/translations/keepassx_sk.ts b/share/translations/keepassx_sk.ts
index ef4289e868..cf01642d57 100644
--- a/share/translations/keepassx_sk.ts
+++ b/share/translations/keepassx_sk.ts
@@ -743,7 +743,7 @@ Prosím, vyberte správnu databázu na uloženie prihlasovacích údajov.</trans
     </message>
     <message>
         <source>&amp;Brave</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Odvážny</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
@@ -767,11 +767,11 @@ Prosím, vyberte správnu databázu na uloženie prihlasovacích údajov.</trans
     </message>
     <message>
         <source>Don&apos;t display the popup suggesting migration of legacy KeePassHTTP settings.</source>
-        <translation type="unfinished"/>
+        <translation>Nezobrazovať okno s návrhom na migráciu starých nastavení KeePassHTTP.</translation>
     </message>
     <message>
         <source>&amp;Do not prompt for KeePassHTTP settings migration.</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Nepýtať sa na migráciu nastavení KeePassHTTP.</translation>
     </message>
     <message>
         <source>Custom proxy location field</source>
@@ -878,7 +878,11 @@ Chcete teraz migrovať svoje nastavenia?</translation>
 
 Give the connection a unique name or ID, for example:
 chrome-laptop.</source>
-        <translation type="unfinished"/>
+        <translation>Obdržali ste požiadavku na priradenie nasledujúcej databázy.
+%1
+
+Zadajte mu jedinečný názov alebo identifikátor, napríklad:
+chrome-laptop.</translation>
     </message>
 </context>
 <context>
@@ -2286,7 +2290,7 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
         <source>&lt;empty URL&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;prázdna URL&gt;</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this URL?</source>
@@ -2451,15 +2455,15 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
         <source>Skip Auto-Submit for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Zapnúť Automatické vypĺňanie pre túto položku</translation>
     </message>
     <message>
         <source>Hide this entry from the browser extension</source>
-        <translation type="unfinished"/>
+        <translation>Skryť túto položku v rozšírení prehliadača</translation>
     </message>
     <message>
         <source>Additional URL&apos;s</source>
-        <translation type="unfinished"/>
+        <translation>Ďalšie URL</translation>
     </message>
     <message>
         <source>Add</source>
@@ -2494,19 +2498,19 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
         <source>Entry history selection</source>
-        <translation type="unfinished"/>
+        <translation>Výber histórie položky</translation>
     </message>
     <message>
         <source>Show entry at selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Zobraziť stav položky v okamžiku zvolenej histórie</translation>
     </message>
     <message>
         <source>Restore entry to selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Obnoviť stav položky do okamžiku zvolenej histórie</translation>
     </message>
     <message>
         <source>Delete selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Vymazať zvolený stav histórie</translation>
     </message>
     <message>
         <source>Delete all history</source>
@@ -2557,7 +2561,7 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Stiahnuť ikonu URL</translation>
     </message>
     <message>
         <source>Repeat password field</source>
@@ -2597,11 +2601,11 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
         <source>Title field</source>
-        <translation type="unfinished"/>
+        <translation>Pole nadpisu</translation>
     </message>
     <message>
         <source>Username field</source>
-        <translation type="unfinished"/>
+        <translation>Pole použ. mena</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
@@ -2685,19 +2689,19 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
-        <translation type="unfinished"/>
+        <translation>Odstrániť kľúč z agenta po zadanom počte sekúnd</translation>
     </message>
     <message>
         <source>Browser for key file</source>
-        <translation type="unfinished"/>
+        <translation>Vybrať súbor kľúča</translation>
     </message>
     <message>
         <source>External key file</source>
-        <translation type="unfinished"/>
+        <translation>Súbor externého kľúča</translation>
     </message>
     <message>
         <source>Select attachment file</source>
-        <translation type="unfinished"/>
+        <translation>Zvoľte súbor prílohy</translation>
     </message>
 </context>
 <context>
@@ -2799,20 +2803,21 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizovať</translation>
     </message>
     <message>
         <source>Your KeePassXC version does not support sharing this container type.
 Supported extensions are: %1.</source>
-        <translation type="unfinished"/>
+        <translation>Táto verzia KeePassXC nepodporuje zdieľanie tohoto typu kontajnera.
+Podporované rozšírenia sú: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 už bolo exportované touto databázou.</translation>
     </message>
     <message>
         <source>%1 is already being imported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 už bolo importované touto databázou.</translation>
     </message>
     <message>
         <source>%1 is being imported and exported by different groups in this database.</source>
@@ -2821,27 +2826,27 @@ Supported extensions are: %1.</source>
     <message>
         <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
         <comment>KeeShare is a proper noun</comment>
-        <translation type="unfinished"/>
+        <translation>KeeShare je momentálne vypnuté. Import/export môžete zapnúť v nastaveniach aplikácie.</translation>
     </message>
     <message>
         <source>Database export is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Export databázy je momentálne vypnutý v nastaveniach aplikácie.</translation>
     </message>
     <message>
         <source>Database import is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Import databázy je momentálne vypnutý v nastaveniach aplikácie.</translation>
     </message>
     <message>
         <source>Sharing mode field</source>
-        <translation type="unfinished"/>
+        <translation>Pole režimu zdieľania</translation>
     </message>
     <message>
         <source>Path to share file field</source>
-        <translation type="unfinished"/>
+        <translation>Pole cesty zdieľania súboru</translation>
     </message>
     <message>
         <source>Browser for share file</source>
-        <translation type="unfinished"/>
+        <translation>Vybrať zdieľaný súbor</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -2912,7 +2917,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Search toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Prepnúť hľadanie tejto a podriadených skupín</translation>
     </message>
     <message>
         <source>Default auto-type sequence field</source>
@@ -2979,43 +2984,43 @@ Supported extensions are: %1.</source>
     </message>
     <message numerus="yes">
         <source>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Táto ikona je použitá v %n položke a bude nahradená predvolenou ikonou. Naozaj ju chcete odstrániť?</numerusform><numerusform>Táto ikona je použitá v %n položkách a bude nahradená predvolenou ikonou. Naozaj ju chcete odstrániť?</numerusform><numerusform>Táto ikona je použitá v %n položkách a bude nahradená predvolenou ikonou. Naozaj ju chcete odstrániť?</numerusform><numerusform>Táto ikona je použitá v %n položkách a bude nahradená predvolenou ikonou. Naozaj ju chcete odstrániť?</numerusform></translation>
     </message>
     <message>
         <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
-        <translation type="unfinished"/>
+        <translation>Môžete zapnúť webovú službu ikon DuckDuckGo v Nástroje -&gt; Nastavenie -&gt; Bezpečnosť</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Stiahnuť ikonu URL</translation>
     </message>
     <message>
         <source>Apply selected icon to subgroups and entries</source>
-        <translation type="unfinished"/>
+        <translation>Použiť zvolenú ikonu na podskupiny a položky</translation>
     </message>
     <message>
         <source>Apply icon &amp;to ...</source>
-        <translation type="unfinished"/>
+        <translation>Použiť ikonu &amp;na …</translation>
     </message>
     <message>
         <source>Apply to this only</source>
-        <translation type="unfinished"/>
+        <translation>Použiť len na túto</translation>
     </message>
     <message>
         <source>Also apply to child groups</source>
-        <translation type="unfinished"/>
+        <translation>Použiť aj na podriadené skupiny</translation>
     </message>
     <message>
         <source>Also apply to child entries</source>
-        <translation type="unfinished"/>
+        <translation>Použiť aj na podriadené položky</translation>
     </message>
     <message>
         <source>Also apply to all children</source>
-        <translation type="unfinished"/>
+        <translation>Použiť na všetkých potomkov</translation>
     </message>
     <message>
         <source>Existing icon selected.</source>
-        <translation type="unfinished"/>
+        <translation>Zvolená existujúca ikona.</translation>
     </message>
 </context>
 <context>
@@ -3178,7 +3183,11 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
     <message numerus="yes">
         <source>Unable to open file(s):
 %1</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Nemožno otvoriť súbor:
+%1</numerusform><numerusform>Nemožno otvoriť súbory:
+%1</numerusform><numerusform>Nemožno otvoriť súbory:
+%1</numerusform><numerusform>Nemožno otvoriť súbory:
+%1</numerusform></translation>
     </message>
     <message>
         <source>Attachments</source>
@@ -3186,19 +3195,19 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
     </message>
     <message>
         <source>Add new attachment</source>
-        <translation type="unfinished"/>
+        <translation>Pridať novú prílohu</translation>
     </message>
     <message>
         <source>Remove selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Odstrániť zvolenú prílohu</translation>
     </message>
     <message>
         <source>Open selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Otvoriť zvolenú prílohu</translation>
     </message>
     <message>
         <source>Save selected attachment to disk</source>
-        <translation type="unfinished"/>
+        <translation>Uložiť zvolenú prílohu na disk</translation>
     </message>
 </context>
 <context>
@@ -3380,7 +3389,7 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
     </message>
     <message>
         <source>Display current TOTP value</source>
-        <translation type="unfinished"/>
+        <translation>Zobraziť aktuálnu hodnotu TOTP</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -3429,7 +3438,7 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
     <name>FdoSecrets::Service</name>
     <message>
         <source>Failed to register DBus service at %1: another secret service is running.</source>
-        <translation type="unfinished"/>
+        <translation>Zlyhala registrácia služby DBus na %1: je spustená iná služba.</translation>
     </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
@@ -3467,7 +3476,7 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation type="unfinished"/>
+        <translation>Stiahnuť ikony</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -3476,7 +3485,8 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
     <message>
         <source>Having trouble downloading icons?
 You can enable the DuckDuckGo website icon service in the security section of the application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Máte problémy so sťahovaním ikon?
+V bezpečnostnej sekcii nastavení aplikácie môžete zapnúť webovú službu ikon.</translation>
     </message>
     <message>
         <source>Close</source>
@@ -3492,11 +3502,11 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Please wait, processing entry list...</source>
-        <translation type="unfinished"/>
+        <translation>Prosím, počkajte, spracovanie zoznamu položiek…</translation>
     </message>
     <message>
         <source>Downloading...</source>
-        <translation type="unfinished"/>
+        <translation>Sťahovanie…</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -3512,7 +3522,7 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Downloading favicons (%1/%2)...</source>
-        <translation type="unfinished"/>
+        <translation>Sťahovanie ikon (%1/%2)…</translation>
     </message>
 </context>
 <context>
@@ -3559,7 +3569,8 @@ You can enable the DuckDuckGo website icon service in the security section of th
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Boli zadané neplatné prihlasovacie údaje, prosím skúste znova.
+Ak sa to opakuje, potom môže byť súbor databázy poškodený.</translation>
     </message>
 </context>
 <context>
@@ -3694,11 +3705,12 @@ If this reoccurs, then your database file may be corrupt.</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Boli zadané neplatné prihlasovacie údaje, prosím skúste znova.
+Ak sa to opakuje, potom môže byť súbor databázy poškodený.</translation>
     </message>
     <message>
         <source>(HMAC mismatch)</source>
-        <translation type="unfinished"/>
+        <translation>(nezhoda HMAC)</translation>
     </message>
 </context>
 <context>
@@ -4084,7 +4096,8 @@ Riadok %2, stĺpec %3</translation>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Boli zadané neplatné prihlasovacie údaje, prosím skúste znova.
+Ak sa to opakuje, potom môže byť súbor databázy poškodený.</translation>
     </message>
 </context>
 <context>
@@ -4613,7 +4626,7 @@ Očakávajte chyby a menšie problémy, táto verzia nie je určená na produkč
     </message>
     <message>
         <source>Go to online documentation (opens browser)</source>
-        <translation type="unfinished"/>
+        <translation>Prejsť na dokumentáciu on-line (otvorí prehliadač)</translation>
     </message>
     <message>
         <source>&amp;User Guide</source>
@@ -4771,7 +4784,7 @@ Očakávajte chyby a menšie problémy, táto verzia nie je určená na produkč
     </message>
     <message>
         <source>Unable to read all IV bytes, wanted 16 but got %1</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno čítať všetky bajty IV, potrebných 16, ale získaných %1</translation>
     </message>
     <message>
         <source>Unable to init cipher for opdata01: %1</source>
@@ -4779,7 +4792,7 @@ Očakávajte chyby a menšie problémy, táto verzia nie je určená na produkč
     </message>
     <message>
         <source>Unable to read all HMAC signature bytes</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno čítať všetky bajty podpisu HMAC</translation>
     </message>
     <message>
         <source>Malformed OpData01 due to a failed HMAC</source>
@@ -4806,27 +4819,27 @@ Očakávajte chyby a menšie problémy, táto verzia nie je určená na produkč
     <name>OpVaultReader</name>
     <message>
         <source>Directory .opvault must exist</source>
-        <translation type="unfinished"/>
+        <translation>Adresár .opvault musí existovať</translation>
     </message>
     <message>
         <source>Directory .opvault must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Adresár .opvault musí byť čitateľný</translation>
     </message>
     <message>
         <source>Directory .opvault/default must exist</source>
-        <translation type="unfinished"/>
+        <translation>Adresár .opvault/default musí existovať</translation>
     </message>
     <message>
         <source>Directory .opvault/default must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Adresár .opvault/default musí byť čitateľný</translation>
     </message>
     <message>
         <source>Unable to decode masterKey: %1</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno dekódovať hlavný kľúč: %1</translation>
     </message>
     <message>
         <source>Unable to derive master key: %1</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno odvodiť hlavný kľúč: %1</translation>
     </message>
 </context>
 <context>
@@ -4932,11 +4945,11 @@ Očakávajte chyby a menšie problémy, táto verzia nie je určená na produkč
     <name>PasswordEdit</name>
     <message>
         <source>Passwords do not match</source>
-        <translation type="unfinished"/>
+        <translation>Heslá sa nezhodujú.</translation>
     </message>
     <message>
         <source>Passwords match so far</source>
-        <translation type="unfinished"/>
+        <translation>Heslá sa zhodujú až potiaľ</translation>
     </message>
 </context>
 <context>
@@ -6072,7 +6085,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Cannot generate a password and prompt at the same time!</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno naraz generovať aj zadať heslo!</translation>
     </message>
     <message>
         <source>Adds a new group to a database.</source>
@@ -6096,11 +6109,11 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Check if any passwords have been publicly leaked. FILENAME must be the path of a file listing SHA-1 hashes of leaked passwords in HIBP format, as available from https://haveibeenpwned.com/Passwords.</source>
-        <translation type="unfinished"/>
+        <translation>Skontrolovať, či nejaké heslo neuniklo na verejnosť. MENOSÚBORU musí byť cesta k súboru so zoznamom odtlačkov SHA-1 uniknutých hesiel vo formáte HIBP, ako je dostupný z https://haveibeenpwned.com/Passwords.</translation>
     </message>
     <message>
         <source>FILENAME</source>
-        <translation type="unfinished"/>
+        <translation>MENOSÚBORU</translation>
     </message>
     <message>
         <source>Analyze passwords for weaknesses and problems.</source>
@@ -6108,7 +6121,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Failed to open HIBP file %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Zlyhalo otvorenie súboru HIBP %1: %2</translation>
     </message>
     <message>
         <source>Evaluating database entries against HIBP file, this will take a while...</source>
@@ -6120,7 +6133,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Display this help.</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazí tohoto pomocníka.</translation>
     </message>
     <message>
         <source>Yubikey slot used to encrypt the database.</source>
@@ -6128,11 +6141,11 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>slot</source>
-        <translation type="unfinished"/>
+        <translation>slot</translation>
     </message>
     <message>
         <source>Invalid word count %1</source>
-        <translation type="unfinished"/>
+        <translation>Neplatný počet slov %1</translation>
     </message>
     <message>
         <source>The word list is too small (&lt; 1000 items)</source>
@@ -6140,7 +6153,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Exit interactive mode.</source>
-        <translation type="unfinished"/>
+        <translation>Ukončiť interaktívny režim.</translation>
     </message>
     <message>
         <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
@@ -6152,27 +6165,27 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Unable to export database to XML: %1</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno exportovať databázu do XML: %1</translation>
     </message>
     <message>
         <source>Unsupported format %1</source>
-        <translation type="unfinished"/>
+        <translation>Nepodporovaný formát: %1</translation>
     </message>
     <message>
         <source>Use numbers</source>
-        <translation type="unfinished"/>
+        <translation>Použiť čísla</translation>
     </message>
     <message>
         <source>Invalid password length %1</source>
-        <translation type="unfinished"/>
+        <translation>Neplatná dĺžka hesla %1</translation>
     </message>
     <message>
         <source>Display command help.</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazí pomocníka príkazu.</translation>
     </message>
     <message>
         <source>Available commands:</source>
-        <translation type="unfinished"/>
+        <translation>Dostupné príkazy:</translation>
     </message>
     <message>
         <source>Import the contents of an XML database.</source>
@@ -6188,15 +6201,15 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno importovať databázu z exportu XML %1</translation>
     </message>
     <message>
         <source>Successfully imported database.</source>
-        <translation type="unfinished"/>
+        <translation>Úspešne importovaná databáza.</translation>
     </message>
     <message>
         <source>Unknown command %1</source>
-        <translation type="unfinished"/>
+        <translation>Neznáma príkaz %1</translation>
     </message>
     <message>
         <source>Flattens the output to single lines.</source>
@@ -6212,7 +6225,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Successfully merged %1 into %2.</source>
-        <translation type="unfinished"/>
+        <translation>Úspešne zlúčené %1 do %2.</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
@@ -6220,7 +6233,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Moves an entry to a new group.</source>
-        <translation type="unfinished"/>
+        <translation>Presunie položku do novej skupiny.</translation>
     </message>
     <message>
         <source>Path of the entry to move.</source>
@@ -6228,7 +6241,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Path of the destination group.</source>
-        <translation type="unfinished"/>
+        <translation>Cesta cieľovej skupiny.</translation>
     </message>
     <message>
         <source>Could not find group with path %1.</source>
@@ -6527,7 +6540,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"/>
+        <translation>Odpojiť</translation>
     </message>
     <message>
         <source>Database settings</source>
@@ -6535,7 +6548,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Edit database settings</source>
-        <translation type="unfinished"/>
+        <translation>Upraviť nastavenia databázy</translation>
     </message>
     <message>
         <source>Unlock database</source>
@@ -6543,7 +6556,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Unlock database to show more information</source>
-        <translation type="unfinished"/>
+        <translation>Odomknúť databázu na zobrazenie ďalších informácií</translation>
     </message>
     <message>
         <source>Lock database</source>
@@ -6551,7 +6564,7 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Unlock to show</source>
-        <translation type="unfinished"/>
+        <translation>Odomknúť na zobrazenie</translation>
     </message>
     <message>
         <source>None</source>
@@ -6683,15 +6696,15 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Allow KeeShare imports</source>
-        <translation type="unfinished"/>
+        <translation>Povoliť importy KeeShare</translation>
     </message>
     <message>
         <source>Allow KeeShare exports</source>
-        <translation type="unfinished"/>
+        <translation>Povoliť exporty KeeShare</translation>
     </message>
     <message>
         <source>Only show warnings and errors</source>
-        <translation type="unfinished"/>
+        <translation>Zobraziť len upozornenia a chyby</translation>
     </message>
     <message>
         <source>Key</source>
@@ -6703,35 +6716,35 @@ Jadro: %3 %4</translation>
     </message>
     <message>
         <source>Generate new certificate</source>
-        <translation type="unfinished"/>
+        <translation>Generovať nový certifikát</translation>
     </message>
     <message>
         <source>Import existing certificate</source>
-        <translation type="unfinished"/>
+        <translation>Importovať existujúci certifikát</translation>
     </message>
     <message>
         <source>Export own certificate</source>
-        <translation type="unfinished"/>
+        <translation>Exportuje vlastný certifikát</translation>
     </message>
     <message>
         <source>Known shares</source>
-        <translation type="unfinished"/>
+        <translation>Známe zdieľania</translation>
     </message>
     <message>
         <source>Trust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Dôverovať zvolenému certifikátu</translation>
     </message>
     <message>
         <source>Ask whether to trust the selected certificate every time</source>
-        <translation type="unfinished"/>
+        <translation>Vždy sa spýtať, či dôverovať zvolenému certifikátu</translation>
     </message>
     <message>
         <source>Untrust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Zrušiť dôveru zvoleného certifikátu</translation>
     </message>
     <message>
         <source>Remove selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Odstrániť zvolený certifikát</translation>
     </message>
 </context>
 <context>
@@ -6900,7 +6913,7 @@ Prepis podpísaných zdieľaných kontajnerov nie je podporovaný - export sa ne
     </message>
     <message numerus="yes">
         <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Platnosť vyprší za % n sekundu</numerusform><numerusform>Platnosť vyprší za % n sekundy</numerusform><numerusform>Platnosť vyprší za % n sekúnd</numerusform><numerusform>Platnosť vyprší za &lt;b&gt;% n&lt;/b&gt; sekúnd</numerusform></translation>
     </message>
 </context>
 <context>
@@ -6960,19 +6973,19 @@ Prepis podpísaných zdieľaných kontajnerov nie je podporovaný - export sa ne
     </message>
     <message>
         <source>Secret Key:</source>
-        <translation type="unfinished"/>
+        <translation>Tajný kľúč:</translation>
     </message>
     <message>
         <source>Secret key must be in Base32 format</source>
-        <translation type="unfinished"/>
+        <translation>Tajný kľúč musí byť vo formáte Base32</translation>
     </message>
     <message>
         <source>Secret key field</source>
-        <translation type="unfinished"/>
+        <translation>Pole tajného kľúča</translation>
     </message>
     <message>
         <source>Algorithm:</source>
-        <translation type="unfinished"/>
+        <translation>Algoritmus:</translation>
     </message>
     <message>
         <source>Time step field</source>
@@ -6980,24 +6993,25 @@ Prepis podpísaných zdieľaných kontajnerov nie je podporovaný - export sa ne
     </message>
     <message>
         <source> digits</source>
-        <translation type="unfinished"/>
+        <translation>číslice</translation>
     </message>
     <message>
         <source>Invalid TOTP Secret</source>
-        <translation type="unfinished"/>
+        <translation>Neplatné tajomstvo TOTP</translation>
     </message>
     <message>
         <source>You have entered an invalid secret key. The key must be in Base32 format.
 Example: JBSWY3DPEHPK3PXP</source>
-        <translation type="unfinished"/>
+        <translation>Zadali ste neplatný tajný kľúč. Kľúč musí byť vo formáte Base32.
+Napríklad: JBSWY3DPEHPK3PXP</translation>
     </message>
     <message>
         <source>Confirm Remove TOTP Settings</source>
-        <translation type="unfinished"/>
+        <translation>Potvrďte odstránenie nastavení TOTP</translation>
     </message>
     <message>
         <source>Are you sure you want to delete TOTP settings for this entry?</source>
-        <translation type="unfinished"/>
+        <translation>Naozaj chcete odstrániť nastavenia TOTP tejto položky?</translation>
     </message>
 </context>
 <context>
@@ -7087,7 +7101,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Open a recent database</source>
-        <translation type="unfinished"/>
+        <translation>Otvoriť nedávnu databázu</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/keepassx_sv.ts b/share/translations/keepassx_sv.ts
index ccde447a7e..f49d239a7c 100644
--- a/share/translations/keepassx_sv.ts
+++ b/share/translations/keepassx_sv.ts
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>Contributors</source>
-        <translation>Bidragsgivare</translation>
+        <translation>Medverkande</translation>
     </message>
     <message>
         <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
@@ -93,15 +93,15 @@
     </message>
     <message>
         <source>Follow style</source>
-        <translation>Följstil</translation>
+        <translation>Följ stil</translation>
     </message>
     <message>
         <source>Reset Settings?</source>
-        <translation>Återställa inställningarna?</translation>
+        <translation>Vill du återställa inställningarna?</translation>
     </message>
     <message>
         <source>Are you sure you want to reset all general and security settings to default?</source>
-        <translation>Är du säker på att  du vill återställa alla allmäna inställningar och säkerhetsinställningar till standardvärden?</translation>
+        <translation>Vill du verkligen återställa alla allmäna och säkerhetsinställningar till standardinställning?</translation>
     </message>
 </context>
 <context>
@@ -225,63 +225,63 @@
     </message>
     <message>
         <source>Remember previously used databases</source>
-        <translation>Kom ihåg tidigare använda databaser</translation>
+        <translation>Kom ihåg tidigare databaser</translation>
     </message>
     <message>
         <source>Load previously open databases on startup</source>
-        <translation>Ladda tidigare använda databaser vid start</translation>
+        <translation>Läs in tidigare öppna databaser vid programstart</translation>
     </message>
     <message>
         <source>Remember database key files and security dongles</source>
-        <translation>Kom ihåg databasers nyckelfiler och säkerhetsdonglar </translation>
+        <translation>Kom ihåg databasnyckelfiler och säkerhetsenheter</translation>
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
-        <translation type="unfinished"/>
+        <translation>Sök efter uppdateringar vid programstart, en gång per vecka</translation>
     </message>
     <message>
         <source>Include beta releases when checking for updates</source>
-        <translation type="unfinished"/>
+        <translation>Inkludera betaversioner vid sökning efter uppdateringar</translation>
     </message>
     <message>
         <source>Button style:</source>
-        <translation type="unfinished"/>
+        <translation>Knappstil:</translation>
     </message>
     <message>
         <source>Language:</source>
-        <translation type="unfinished"/>
+        <translation>Språk:</translation>
     </message>
     <message>
         <source>(restart program to activate)</source>
-        <translation type="unfinished"/>
+        <translation>(starta om programmet för att aktivera)</translation>
     </message>
     <message>
         <source>Minimize window after unlocking database</source>
-        <translation type="unfinished"/>
+        <translation>Minimera fönstret efter upplåsning av databas</translation>
     </message>
     <message>
         <source>Minimize when opening a URL</source>
-        <translation type="unfinished"/>
+        <translation>Minimera vid öppning av URL</translation>
     </message>
     <message>
         <source>Hide window when copying to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Dölj fönstret vid kopiering till urklipp</translation>
     </message>
     <message>
         <source>Minimize</source>
-        <translation type="unfinished"/>
+        <translation>Mimimera</translation>
     </message>
     <message>
         <source>Drop to background</source>
-        <translation type="unfinished"/>
+        <translation>Flytta till bakgrunden</translation>
     </message>
     <message>
         <source>Favicon download timeout:</source>
-        <translation type="unfinished"/>
+        <translation>Tidsgräns för nerladdning av favicon:</translation>
     </message>
     <message>
         <source>Website icon download timeout in seconds</source>
-        <translation type="unfinished"/>
+        <translation>Tidsgräns för nerladdning av webbsideikon, i sekunder.</translation>
     </message>
     <message>
         <source> sec</source>
@@ -290,31 +290,31 @@
     </message>
     <message>
         <source>Toolbar button style</source>
-        <translation type="unfinished"/>
+        <translation>Knappstil för verktygsfält</translation>
     </message>
     <message>
         <source>Use monospaced font for Notes</source>
-        <translation type="unfinished"/>
+        <translation>Använda teckensnitt med fast teckenbredd för anteckningar</translation>
     </message>
     <message>
         <source>Language selection</source>
-        <translation type="unfinished"/>
+        <translation>Språkval</translation>
     </message>
     <message>
         <source>Reset Settings to Default</source>
-        <translation type="unfinished"/>
+        <translation>Återställ inställningarna till standardinställning</translation>
     </message>
     <message>
         <source>Global auto-type shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Övergripande autoskrivgenväg</translation>
     </message>
     <message>
         <source>Auto-type character typing delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation>Fördröjning vid utomatisk skrivning, i millisekunder.</translation>
     </message>
     <message>
         <source>Auto-type start delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation>Autoskrivfördröjning i millisekunder</translation>
     </message>
 </context>
 <context>
@@ -390,19 +390,19 @@
     </message>
     <message>
         <source>Use DuckDuckGo service to download website icons</source>
-        <translation type="unfinished"/>
+        <translation>Använd DuckDuckGo för att ladda ner webbplatsikoner</translation>
     </message>
     <message>
         <source>Clipboard clear seconds</source>
-        <translation type="unfinished"/>
+        <translation>Tidsgräns för urklippsrensing i sekunder</translation>
     </message>
     <message>
         <source>Touch ID inactivity reset</source>
-        <translation type="unfinished"/>
+        <translation>Återställning av Touch-ID vid inaktivitet</translation>
     </message>
     <message>
         <source>Database lock timeout seconds</source>
-        <translation type="unfinished"/>
+        <translation>Tidsgräns för databaslås i sekunder</translation>
     </message>
     <message>
         <source> min</source>
@@ -411,7 +411,7 @@
     </message>
     <message>
         <source>Clear search query after</source>
-        <translation type="unfinished"/>
+        <translation>Radera söksträng efter</translation>
     </message>
 </context>
 <context>
@@ -446,11 +446,11 @@
     </message>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Tillstånd krävs</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC kräver åtkomsttillstånd för att utföra automatisk skrivning på postnivå. Om du redan har beviljat tillstånd, kanske du behöver styarta om KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -502,11 +502,11 @@
     <name>AutoTypePlatformMac</name>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Tillstånd krävs</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC kräver åtkomst- och inspelningstillstånd för att utföra automatisk skrivning på övergripande nivå. Skärminspelning krävs för att använda fönstertiteln till att identifiera poster. Om du redan har beviljat tillstånd, kanske du behöver styarta om KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -517,7 +517,7 @@
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Välj post att autoskriva:</translation>
+        <translation>Välj post att skriva automatiskt:</translation>
     </message>
     <message>
         <source>Search...</source>
@@ -546,15 +546,15 @@
         <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
         <translation>%1 har begärt åtkomst till lösenorden för följande objekt.
-Välj om du vill tillåta åtkomst.</translation>
+Välj om du vill tillåta eller neka åtkomst.</translation>
     </message>
     <message>
         <source>Allow access</source>
-        <translation type="unfinished"/>
+        <translation>Tillåt åtkomst</translation>
     </message>
     <message>
         <source>Deny access</source>
-        <translation type="unfinished"/>
+        <translation>Neka åtkomst</translation>
     </message>
 </context>
 <context>
@@ -635,7 +635,7 @@ Välj rätt databas för att spara inloggningsuppgifterna.</translation>
     </message>
     <message>
         <source>&amp;Return only best-matching credentials</source>
-        <translation>&amp;Returnera bara de bäst lämpade inloggningsuppgifterna</translation>
+        <translation>&amp;Returnera bara de bäst lämpade autentiseringsuppgifterna</translation>
     </message>
     <message>
         <source>Sort &amp;matching credentials by title</source>
@@ -743,47 +743,47 @@ Välj rätt databas för att spara inloggningsuppgifterna.</translation>
     </message>
     <message>
         <source>&amp;Brave</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Brave</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
-        <translation type="unfinished"/>
+        <translation>Returnerar förfallna autentiseringsuppgifter [Förfallen] läggs till i titeln.</translation>
     </message>
     <message>
         <source>&amp;Allow returning expired credentials.</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tillåt förfallna autentiseringsuppgifter.</translation>
     </message>
     <message>
         <source>Enable browser integration</source>
-        <translation type="unfinished"/>
+        <translation>Aktivera webbläsarintegration</translation>
     </message>
     <message>
         <source>Browsers installed as snaps are currently not supported.</source>
-        <translation type="unfinished"/>
+        <translation>Webbläsare installerade via Snap, stöds för närvarande inte.</translation>
     </message>
     <message>
         <source>All databases connected to the extension will return matching credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Alla databaser anslutna till tillägget, kommer att returnera matchande autentiseringsuppgifter.</translation>
     </message>
     <message>
         <source>Don&apos;t display the popup suggesting migration of legacy KeePassHTTP settings.</source>
-        <translation type="unfinished"/>
+        <translation>Visa inte popup-fönstret som föreslår migrering av äldre KeePassHTTP-inställningar.</translation>
     </message>
     <message>
         <source>&amp;Do not prompt for KeePassHTTP settings migration.</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Fråga inte efter inställningar för KeePassHTTP-migrering.</translation>
     </message>
     <message>
         <source>Custom proxy location field</source>
-        <translation type="unfinished"/>
+        <translation>Fält för anpassad proxyplats</translation>
     </message>
     <message>
         <source>Browser for custom proxy file</source>
-        <translation type="unfinished"/>
+        <translation>Webbläsare för anpassad proxyfil</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning&lt;/b&gt;, the keepassxc-proxy application was not found!&lt;br /&gt;Please check the KeePassXC installation directory or confirm the custom path in advanced options.&lt;br /&gt;Browser integration WILL NOT WORK without the proxy application.&lt;br /&gt;Expected Path: %1</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Varning!&lt;/b&gt; Program för keepassxc-proxy kunde inte hittas!&lt;br /&gt;Kontrollera KeePassXCs installationsmapp eller bekräfta den anpassade sökvägen i avancerade alternativ.&lt;br /&gt;Webbläsarintegration FUNGERAR INTE utan proxy-programmet.&lt;br /&gt;Förväntad sökväg: %1</translation>
     </message>
 </context>
 <context>
@@ -846,7 +846,7 @@ Flyttade %2 nycklar till anpassad data.</translation>
     </message>
     <message>
         <source>KeePassXC: Legacy browser integration settings detected</source>
-        <translation>KeePassXC: Inställningar för webbläsarintegrering har identifierats</translation>
+        <translation>KeePassXC: Föråldrade inställningar för webbläsarintegrering har identifierats</translation>
     </message>
     <message>
         <source>KeePassXC: Create a new group</source>
@@ -878,7 +878,11 @@ Vill du migrera dina befintliga inställningar nu?</translation>
 
 Give the connection a unique name or ID, for example:
 chrome-laptop.</source>
-        <translation type="unfinished"/>
+        <translation>Du har fått en associationsbegäran för följande databas:
+%1
+
+Ge anslutningen ett unikt namn eller ID, som t.ex.:
+chrome-laptop.</translation>
     </message>
 </context>
 <context>
@@ -990,19 +994,19 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Text qualification</source>
-        <translation type="unfinished"/>
+        <translation>Textkvalificering</translation>
     </message>
     <message>
         <source>Field separation</source>
-        <translation type="unfinished"/>
+        <translation>Fältseparation</translation>
     </message>
     <message>
         <source>Number of header lines to discard</source>
-        <translation type="unfinished"/>
+        <translation>Antal rubrikrader att kassera</translation>
     </message>
     <message>
         <source>CSV import preview</source>
-        <translation type="unfinished"/>
+        <translation>Förhandsgranskning av CSV-import</translation>
     </message>
 </context>
 <context>
@@ -1055,19 +1059,20 @@ chrome-laptop.</source>
     <message>
         <source>%1
 Backup database located at %2</source>
-        <translation type="unfinished"/>
+        <translation>%1
+Säkerhetskopierad databas hittad i %2</translation>
     </message>
     <message>
         <source>Could not save, database does not point to a valid file.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte spara. Databasen pekar inte mot en giltig fil.</translation>
     </message>
     <message>
         <source>Could not save, database file is read-only.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte spara. Databasfilen är skrivskyddad.</translation>
     </message>
     <message>
         <source>Database file has unmerged changes.</source>
-        <translation type="unfinished"/>
+        <translation>Databasfilen har ändringar som inte har infogats.</translation>
     </message>
     <message>
         <source>Recycle Bin</source>
@@ -1123,39 +1128,39 @@ komma att tas bort för i framtiden.
     </message>
     <message>
         <source>Failed to open key file: %1</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte öppna nyckelfil: %1</translation>
     </message>
     <message>
         <source>Select slot...</source>
-        <translation type="unfinished"/>
+        <translation>Välj plats...</translation>
     </message>
     <message>
         <source>Unlock KeePassXC Database</source>
-        <translation type="unfinished"/>
+        <translation>Lås upp KeePassXC-databas</translation>
     </message>
     <message>
         <source>Enter Password:</source>
-        <translation type="unfinished"/>
+        <translation>Ange lösenord:</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Lösenordsfält</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Visa/Dölj lösenord</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Val av nyckelfil</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Val av plats för hårdvarunyckel</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Bläddra efter nyckelfil</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1163,19 +1168,19 @@ komma att tas bort för i framtiden.
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Uppdatera hårdvarutokens</translation>
     </message>
     <message>
         <source>Hardware Key:</source>
-        <translation type="unfinished"/>
+        <translation>Hårdvarynyckel:</translation>
     </message>
     <message>
         <source>Hardware key help</source>
-        <translation type="unfinished"/>
+        <translation>Hjälp med hårdvarynyckel</translation>
     </message>
     <message>
         <source>TouchID for Quick Unlock</source>
-        <translation type="unfinished"/>
+        <translation>TouchID för snabb upplåsning</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -1183,56 +1188,61 @@ komma att tas bort för i framtiden.
     </message>
     <message>
         <source>Clear Key File</source>
-        <translation type="unfinished"/>
+        <translation>Töm nyckelfilen</translation>
     </message>
     <message>
         <source>Unlock failed and no password given</source>
-        <translation type="unfinished"/>
+        <translation>Upplåsning misslyckades och lösenord saknas</translation>
     </message>
     <message>
         <source>Unlocking the database failed and you did not enter a password.
 Do you want to retry with an &quot;empty&quot; password instead?
 
 To prevent this error from appearing, you must go to &quot;Database Settings / Security&quot; and reset your password.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte låsa upp databasen och du angav inget lösenord.
+Vill du försöka igen, med ett &quot;tomt&quot; lösenord istället?
+
+För att förhindra att detta fel uppstår igen, måste du gå till &quot;Databasinställningar/Säkerhet&quot; och återställa dittlösenord.</translation>
     </message>
     <message>
         <source>Retry with empty password</source>
-        <translation type="unfinished"/>
+        <translation>Försök med tomt lösenord</translation>
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
-        <translation type="unfinished"/>
+        <translation>Ange fler autentiseringsuppgifter (om det finns några):</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Du kan använda en hårdvarynyckel såsom &lt;strong&gt;YubiKey&lt;/strong&gt; eller &lt;strong&gt;OnlyKey&lt;/strong&gt; med anslutningsplatser konfigurerade för HMAC-SHA1.&lt;/p&gt;
+&lt;p&gt;Klicka för mer information...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Som tillägg till ditt huvudlösenord, kan du använda en hemlig fil för att förbättra säkerheten i din databas. En sådan fil kan genereras i databasens säkerhetsinställningar.&lt;/p&gt;&lt;p&gt;Detta är &lt;strong&gt;inte&lt;/strong&gt; din *.kdbx-databasfil!&lt;br&gt;Om du inte har någon nyckelfil, lämnar du fältet tomt.&lt;/p&gt;&lt;p&gt;Klicka för mer information...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Key file help</source>
-        <translation type="unfinished"/>
+        <translation>Nyckelfilshjälp</translation>
     </message>
     <message>
         <source>?</source>
-        <translation type="unfinished"/>
+        <translation>?</translation>
     </message>
     <message>
         <source>Select key file...</source>
-        <translation type="unfinished"/>
+        <translation>Välj nyckelfil...</translation>
     </message>
     <message>
         <source>Cannot use database file as key file</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte använda en databasfil som nyckelfil</translation>
     </message>
     <message>
         <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
-        <translation type="unfinished"/>
+        <translation>Du kan inte använda din databasfil som nyckelfil.
+Om du inte har någon nyckelfil, lämnar du fältet tomt.</translation>
     </message>
 </context>
 <context>
@@ -1389,11 +1399,11 @@ Detta är nödvändigt för att få kompatibilitet med webbläsartillägget.</tr
     </message>
     <message>
         <source>Stored browser keys</source>
-        <translation type="unfinished"/>
+        <translation>Lagrade webbläsarnycklar</translation>
     </message>
     <message>
         <source>Remove selected key</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort markerad nyckel</translation>
     </message>
 </context>
 <context>
@@ -1404,11 +1414,11 @@ Detta är nödvändigt för att få kompatibilitet med webbläsartillägget.</tr
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
-        <translation>AES: 256 Bit   (standard)</translation>
+        <translation>AES: 256 bitar   (standard)</translation>
     </message>
     <message>
         <source>Twofish:  256 Bit</source>
-        <translation>Twofish:  256 Bit</translation>
+        <translation>Twofish:  256 bitar</translation>
     </message>
     <message>
         <source>Key Derivation Function:</source>
@@ -1539,61 +1549,61 @@ Om du behåller detta antal, kan din databas bli för lätt att hacka!</translat
     </message>
     <message>
         <source>Change existing decryption time</source>
-        <translation type="unfinished"/>
+        <translation>Ändra befintlig avkrypteringstid</translation>
     </message>
     <message>
         <source>Decryption time in seconds</source>
-        <translation type="unfinished"/>
+        <translation>Avkrypteringstid i sekunder</translation>
     </message>
     <message>
         <source>Database format</source>
-        <translation type="unfinished"/>
+        <translation>Databasformat</translation>
     </message>
     <message>
         <source>Encryption algorithm</source>
-        <translation type="unfinished"/>
+        <translation>Krypteringsalgoritm</translation>
     </message>
     <message>
         <source>Key derivation function</source>
-        <translation type="unfinished"/>
+        <translation>Nyckelhärledningsfunktion</translation>
     </message>
     <message>
         <source>Transform rounds</source>
-        <translation type="unfinished"/>
+        <translation>Transformeringsrundor</translation>
     </message>
     <message>
         <source>Memory usage</source>
-        <translation type="unfinished"/>
+        <translation>Minnesanvändning</translation>
     </message>
     <message>
         <source>Parallelism</source>
-        <translation type="unfinished"/>
+        <translation>Parallellitet</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetFdoSecrets</name>
     <message>
         <source>Exposed Entries</source>
-        <translation type="unfinished"/>
+        <translation>Exponerade poster</translation>
     </message>
     <message>
         <source>Don&apos;t e&amp;xpose this database</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Visa inte denna databas</translation>
     </message>
     <message>
         <source>Expose entries &amp;under this group:</source>
-        <translation type="unfinished"/>
+        <translation>Visa poster &amp;under denna grupp:</translation>
     </message>
     <message>
         <source>Enable fd.o Secret Service to access these settings.</source>
-        <translation type="unfinished"/>
+        <translation>Aktivera fd.o Secret Service, för åtkomst till dessa inställningar.</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
     <message>
         <source>Database Meta Data</source>
-        <translation>Databasmetadata</translation>
+        <translation>Databasens metadata</translation>
     </message>
     <message>
         <source>Database name:</source>
@@ -1637,36 +1647,37 @@ Om du behåller detta antal, kan din databas bli för lätt att hacka!</translat
     </message>
     <message>
         <source>Database name field</source>
-        <translation type="unfinished"/>
+        <translation>Databasens namn</translation>
     </message>
     <message>
         <source>Database description field</source>
-        <translation type="unfinished"/>
+        <translation>Databasens beskrivning</translation>
     </message>
     <message>
         <source>Default username field</source>
-        <translation type="unfinished"/>
+        <translation>Standard användarnamn</translation>
     </message>
     <message>
         <source>Maximum number of history items per entry</source>
-        <translation type="unfinished"/>
+        <translation>Max antal historikobjekt per post</translation>
     </message>
     <message>
         <source>Maximum size of history per entry</source>
-        <translation type="unfinished"/>
+        <translation>Max historikstorlek per post</translation>
     </message>
     <message>
         <source>Delete Recycle Bin</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort papperskorgen</translation>
     </message>
     <message>
         <source>Do you want to delete the current recycle bin and all its contents?
 This action is not reversible.</source>
-        <translation type="unfinished"/>
+        <translation>Vill du ta bort papperskorgen med allt innehåll?
+Denna åtgärd kan inte ångras.</translation>
     </message>
     <message>
         <source> (old)</source>
-        <translation type="unfinished"/>
+        <translation> (gammal)</translation>
     </message>
 </context>
 <context>
@@ -1677,7 +1688,7 @@ This action is not reversible.</source>
     </message>
     <message>
         <source>Breadcrumb</source>
-        <translation>Brödsmulor</translation>
+        <translation>Synlig sökväg</translation>
     </message>
     <message>
         <source>Type</source>
@@ -1723,7 +1734,7 @@ This action is not reversible.</source>
         <source>WARNING! You have not set a password. Using a database without a password is strongly discouraged!
 
 Are you sure you want to continue without a password?</source>
-        <translation>VARNING! Du har inte angivit något lösenord. Du avråds bestämt att använda en databas utan lösenord!
+        <translation>VARNING! Du har inte angivit något lösenord. Du avråds bestämt från att använda en databas utan lösenord!
 
 Vill du verkligen fortsätta utan lösenord?</translation>
     </message>
@@ -1737,7 +1748,7 @@ Vill du verkligen fortsätta utan lösenord?</translation>
     </message>
     <message>
         <source>Continue without password</source>
-        <translation type="unfinished"/>
+        <translation>Fortsätt utan lösenord</translation>
     </message>
 </context>
 <context>
@@ -1752,22 +1763,22 @@ Vill du verkligen fortsätta utan lösenord?</translation>
     </message>
     <message>
         <source>Database name field</source>
-        <translation type="unfinished"/>
+        <translation>Databasnamn</translation>
     </message>
     <message>
         <source>Database description field</source>
-        <translation type="unfinished"/>
+        <translation>Databasbeskrivning</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetStatistics</name>
     <message>
         <source>Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Statistik</translation>
     </message>
     <message>
         <source>Hover over lines with error icons for further information.</source>
-        <translation type="unfinished"/>
+        <translation>Håll muspekaren över rader med felikoner för mer information.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1779,103 +1790,103 @@ Vill du verkligen fortsätta utan lösenord?</translation>
     </message>
     <message>
         <source>Database name</source>
-        <translation type="unfinished"/>
+        <translation>Databasnamn</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Beskrivning</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation type="unfinished"/>
+        <translation>Plats</translation>
     </message>
     <message>
         <source>Last saved</source>
-        <translation type="unfinished"/>
+        <translation>Senast sparad</translation>
     </message>
     <message>
         <source>Unsaved changes</source>
-        <translation type="unfinished"/>
+        <translation>Osparade ändringar</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"/>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"/>
+        <translation>Nej</translation>
     </message>
     <message>
         <source>The database was modified, but the changes have not yet been saved to disk.</source>
-        <translation type="unfinished"/>
+        <translation>Databasen har ändrats, men ändringarna har ännu inte sparats till disk.</translation>
     </message>
     <message>
         <source>Number of groups</source>
-        <translation type="unfinished"/>
+        <translation>Antal grupper</translation>
     </message>
     <message>
         <source>Number of entries</source>
-        <translation type="unfinished"/>
+        <translation>Antal poster</translation>
     </message>
     <message>
         <source>Number of expired entries</source>
-        <translation type="unfinished"/>
+        <translation>Antal förfallna poster</translation>
     </message>
     <message>
         <source>The database contains entries that have expired.</source>
-        <translation type="unfinished"/>
+        <translation>Databasen innehåller poster som har förfallit.</translation>
     </message>
     <message>
         <source>Unique passwords</source>
-        <translation type="unfinished"/>
+        <translation>Unika lösenord</translation>
     </message>
     <message>
         <source>Non-unique passwords</source>
-        <translation type="unfinished"/>
+        <translation>Icke unika lösenord</translation>
     </message>
     <message>
         <source>More than 10% of passwords are reused. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Mer än 10% av lösenorden är återanvända. Försök använda unika lösenord om möjligt.</translation>
     </message>
     <message>
         <source>Maximum password reuse</source>
-        <translation type="unfinished"/>
+        <translation>Max antal återanvända lösenord</translation>
     </message>
     <message>
         <source>Some passwords are used more than three times. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Vissa lösenord är använda mer än tre gånger. Använd unika lösenord om möjligt.</translation>
     </message>
     <message>
         <source>Number of short passwords</source>
-        <translation type="unfinished"/>
+        <translation>Antal korta lösenord</translation>
     </message>
     <message>
         <source>Recommended minimum password length is at least 8 characters.</source>
-        <translation type="unfinished"/>
+        <translation>Rekommenderad minimilängd på lösenord är minst 8 tecken.</translation>
     </message>
     <message>
         <source>Number of weak passwords</source>
-        <translation type="unfinished"/>
+        <translation>Antal svaga lösenord</translation>
     </message>
     <message>
         <source>Recommend using long, randomized passwords with a rating of &apos;good&apos; or &apos;excellent&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Långa slumpartade lösenord med betyget &quot;Bra&quot; eller &quot;Utmärkt&quot; rekommenderas.</translation>
     </message>
     <message>
         <source>Average password length</source>
-        <translation type="unfinished"/>
+        <translation>Genomsnittlig lösenordslängd</translation>
     </message>
     <message>
         <source>%1 characters</source>
-        <translation type="unfinished"/>
+        <translation>%1 tecken</translation>
     </message>
     <message>
         <source>Average password length is less than ten characters. Longer passwords provide more security.</source>
-        <translation type="unfinished"/>
+        <translation>Genomsnittlig lösenordslängd är mindre än 10 tecken. Längre lösenord är säkrare.</translation>
     </message>
     <message>
         <source>Please wait, database statistics are being calculated...</source>
-        <translation type="unfinished"/>
+        <translation>Vänta, databasstatistiken håller på att beräknas...</translation>
     </message>
 </context>
 <context>
@@ -1951,27 +1962,27 @@ Detta är definitivt ett programfel, rapportera det till utvecklarna.</translati
     </message>
     <message>
         <source>Failed to open %1. It either does not exist or is not accessible.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde öppna %1. Antingen finns den inte eller också är den inte åtkomstbar.</translation>
     </message>
     <message>
         <source>Export database to HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Exportera databas till HTML-fil</translation>
     </message>
     <message>
         <source>HTML file</source>
-        <translation type="unfinished"/>
+        <translation>HTML-fil</translation>
     </message>
     <message>
         <source>Writing the HTML file failed.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte skriva HTML-filen.</translation>
     </message>
     <message>
         <source>Export Confirmation</source>
-        <translation type="unfinished"/>
+        <translation>Exportbekräftelse</translation>
     </message>
     <message>
         <source>You are about to export your database to an unencrypted file. This will leave your passwords and sensitive information vulnerable! Are you sure you want to continue?</source>
-        <translation type="unfinished"/>
+        <translation>Du är på väg att exportera din databas till en okrypterad fil. Detta kommer att lämna dina lösenord annan känslig information i ett sårbart skick (klartext). Vill du verkligen fortsätta?</translation>
     </message>
 </context>
 <context>
@@ -2120,7 +2131,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message numerus="yes">
         <source>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</source>
-        <translation><numerusform>Posten &quot;%1&quot; har %2 referens. Vill du skriva över referensen med värden, hoppa över den här posten eller ta bort ändå?</numerusform><numerusform>Posten &quot;%1&quot; har %2 referenser. Vill du skriva över referenserna med värden, hoppa över den här posten eller ta bort ändå?</numerusform></translation>
+        <translation><numerusform>Posten &quot;%1&quot; har %2 referens. Vill du skriva över referensen med nya värden, hoppa över den här posten eller ta bort ändå?</numerusform><numerusform>Posten &quot;%1&quot; har %2 referenser. Vill du skriva över referenserna med nya värden, hoppa över den här posten eller ta bort ändå?</numerusform></translation>
     </message>
     <message>
         <source>Delete group</source>
@@ -2148,11 +2159,11 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Writing the database failed: %1</source>
-        <translation>Kunde inte skriva databas: %1</translation>
+        <translation>Kunde inte skriva databasen: %1</translation>
     </message>
     <message>
         <source>This database is opened in read-only mode. Autosave is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Databasen är öppnad i skrivskyddat läge. Autospar är inaktiverat.</translation>
     </message>
 </context>
 <context>
@@ -2207,7 +2218,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Entry history</source>
-        <translation>Posthistork</translation>
+        <translation>Posthistorik</translation>
     </message>
     <message>
         <source>Add entry</source>
@@ -2279,11 +2290,11 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>&lt;empty URL&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;tom URL&gt;</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this URL?</source>
-        <translation type="unfinished"/>
+        <translation>Vill du verkligen ta bort denna URL?</translation>
     </message>
 </context>
 <context>
@@ -2326,39 +2337,39 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Attribute selection</source>
-        <translation type="unfinished"/>
+        <translation>Attributval</translation>
     </message>
     <message>
         <source>Attribute value</source>
-        <translation type="unfinished"/>
+        <translation>Attributvärde</translation>
     </message>
     <message>
         <source>Add a new attribute</source>
-        <translation type="unfinished"/>
+        <translation>Lägg till nytt attribut</translation>
     </message>
     <message>
         <source>Remove selected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort markerade attribut</translation>
     </message>
     <message>
         <source>Edit attribute name</source>
-        <translation type="unfinished"/>
+        <translation>Redigera attributnamn</translation>
     </message>
     <message>
         <source>Toggle attribute protection</source>
-        <translation type="unfinished"/>
+        <translation>Attributskydd av/på</translation>
     </message>
     <message>
         <source>Show a protected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Visa ett skyddat attribut</translation>
     </message>
     <message>
         <source>Foreground color selection</source>
-        <translation type="unfinished"/>
+        <translation>Val av förgrundsfärg</translation>
     </message>
     <message>
         <source>Background color selection</source>
-        <translation type="unfinished"/>
+        <translation>Val av bakgrundsfärg</translation>
     </message>
 </context>
 <context>
@@ -2369,7 +2380,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Ärv standard autoskrivsekvens från &amp;gruppen</translation>
+        <translation>Hämta autoskrivsekvensstandard från &amp;gruppen</translation>
     </message>
     <message>
         <source>&amp;Use custom Auto-Type sequence:</source>
@@ -2397,46 +2408,46 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Anpassad autoskrivsekvens</translation>
     </message>
     <message>
         <source>Open Auto-Type help webpage</source>
-        <translation type="unfinished"/>
+        <translation>Öppna autoskrivhjälpens hemsida</translation>
     </message>
     <message>
         <source>Existing window associations</source>
-        <translation type="unfinished"/>
+        <translation>Befintliga fönsterassociationer</translation>
     </message>
     <message>
         <source>Add new window association</source>
-        <translation type="unfinished"/>
+        <translation>Lägg till ny fönsterassociation</translation>
     </message>
     <message>
         <source>Remove selected window association</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort markerad fönsterassociation</translation>
     </message>
     <message>
         <source>You can use an asterisk (*) to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Du kan använda en asterisk (*) för att matcha allt (jokertecken)</translation>
     </message>
     <message>
         <source>Set the window association title</source>
-        <translation type="unfinished"/>
+        <translation>Ange fönsterassociationstitel</translation>
     </message>
     <message>
         <source>You can use an asterisk to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Du kan använda en asterisk som jokertecken</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence for this window</source>
-        <translation type="unfinished"/>
+        <translation>Anpassad autoskrivsekvens för detta fönster</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetBrowser</name>
     <message>
         <source>These settings affect to the entry&apos;s behaviour with the browser extension.</source>
-        <translation type="unfinished"/>
+        <translation>Dessa inställningar påverkar posternas beteende i webbläsartillägget.</translation>
     </message>
     <message>
         <source>General</source>
@@ -2444,15 +2455,15 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Skip Auto-Submit for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Undanta autoskriv för den här posten</translation>
     </message>
     <message>
         <source>Hide this entry from the browser extension</source>
-        <translation type="unfinished"/>
+        <translation>Dölj den här posten från webbläsartillägget</translation>
     </message>
     <message>
         <source>Additional URL&apos;s</source>
-        <translation type="unfinished"/>
+        <translation>Ytterligare URL:er</translation>
     </message>
     <message>
         <source>Add</source>
@@ -2464,7 +2475,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändra</translation>
+        <translation>Redigera</translation>
     </message>
 </context>
 <context>
@@ -2487,23 +2498,23 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Entry history selection</source>
-        <translation type="unfinished"/>
+        <translation>Posthistorik</translation>
     </message>
     <message>
         <source>Show entry at selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Visa posten i markerad historikstatus</translation>
     </message>
     <message>
         <source>Restore entry to selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Återställ posten till markerad historikstatus</translation>
     </message>
     <message>
         <source>Delete selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort markerad historikstatus</translation>
     </message>
     <message>
         <source>Delete all history</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort all historik</translation>
     </message>
 </context>
 <context>
@@ -2546,59 +2557,59 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Url field</source>
-        <translation type="unfinished"/>
+        <translation>URL</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Ladda ner favicon för URL:en</translation>
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Upprepa lösenordet</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Lösenordgenerator på/av</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Lösenord</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Visa/Dölj lösenordet</translation>
     </message>
     <message>
         <source>Toggle notes visible</source>
-        <translation type="unfinished"/>
+        <translation>Visa/Dölj anteckningar</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Förfaller</translation>
     </message>
     <message>
         <source>Expiration Presets</source>
-        <translation type="unfinished"/>
+        <translation>Förinställningar för förfallodag</translation>
     </message>
     <message>
         <source>Expiration presets</source>
-        <translation type="unfinished"/>
+        <translation>Förinställningar för förfallodag</translation>
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Anteckningar</translation>
     </message>
     <message>
         <source>Title field</source>
-        <translation type="unfinished"/>
+        <translation>Titel</translation>
     </message>
     <message>
         <source>Username field</source>
-        <translation type="unfinished"/>
+        <translation>Användarnamn</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation type="unfinished"/>
+        <translation>Förfallodag av/på</translation>
     </message>
 </context>
 <context>
@@ -2621,7 +2632,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
-        <translation>Ta bort nyckeln från agenten när databasen är stängd/låst</translation>
+        <translation>Ta bort nyckeln från bakgrundstjänsten när databasen stängs/låses</translation>
     </message>
     <message>
         <source>Public key</source>
@@ -2629,7 +2640,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Add key to agent when database is opened/unlocked</source>
-        <translation>Lägg till nyckeln till agenten när databasen är öppen/upplåst</translation>
+        <translation>Lägg till nyckeln till bakgrundstjänsten när databasen öppnas/låses upp</translation>
     </message>
     <message>
         <source>Comment</source>
@@ -2637,7 +2648,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Decrypt</source>
-        <translation>Dekryptera</translation>
+        <translation>Avkryptera</translation>
     </message>
     <message>
         <source>n/a</source>
@@ -2666,11 +2677,11 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Add to agent</source>
-        <translation>Lägg till i agenten</translation>
+        <translation>Lägg till i bakgrundstjänsten</translation>
     </message>
     <message>
         <source>Remove from agent</source>
-        <translation>Ta bort från agenten</translation>
+        <translation>Ta bort från bakgrundstjänsten</translation>
     </message>
     <message>
         <source>Require user confirmation when this key is used</source>
@@ -2678,19 +2689,19 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort nyckeln från bakgrundstjänsten efter specificerat antal sekunder</translation>
     </message>
     <message>
         <source>Browser for key file</source>
-        <translation type="unfinished"/>
+        <translation>Bläddra efter nyckelfil</translation>
     </message>
     <message>
         <source>External key file</source>
-        <translation type="unfinished"/>
+        <translation>Extern nyckelfil</translation>
     </message>
     <message>
         <source>Select attachment file</source>
-        <translation type="unfinished"/>
+        <translation>Välj bilagefil</translation>
     </message>
 </context>
 <context>
@@ -2776,7 +2787,7 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Select import/export file</source>
-        <translation>Välj fil för import/export</translation>
+        <translation>Välj import-/exportfil</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -2792,65 +2803,66 @@ Vill du inaktivera &quot;Spara säkert&quot; och försöka igen?</translation>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"/>
+        <translation>Synkronisera</translation>
     </message>
     <message>
         <source>Your KeePassXC version does not support sharing this container type.
 Supported extensions are: %1.</source>
-        <translation type="unfinished"/>
+        <translation>Din PassXC-version stöder inte delning av den här behållartypen.
+Filtyper som stöds är: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 exporteras redan av den här databasen.</translation>
     </message>
     <message>
         <source>%1 is already being imported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 importeras redan av den här databasen.</translation>
     </message>
     <message>
         <source>%1 is being imported and exported by different groups in this database.</source>
-        <translation type="unfinished"/>
+        <translation>%1 importeras och exporteras av olika grupper i den här databasen.</translation>
     </message>
     <message>
         <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
         <comment>KeeShare is a proper noun</comment>
-        <translation type="unfinished"/>
+        <translation>KeeShare är inaktiverat. Du kan aktivera import/export i programinställningarna.</translation>
     </message>
     <message>
         <source>Database export is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Databasexport är inaktiverat av programinställningarna.</translation>
     </message>
     <message>
         <source>Database import is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Databasimport är inaktiverat av programinställningarna.</translation>
     </message>
     <message>
         <source>Sharing mode field</source>
-        <translation type="unfinished"/>
+        <translation>Delningsläge</translation>
     </message>
     <message>
         <source>Path to share file field</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg till delningsfil</translation>
     </message>
     <message>
         <source>Browser for share file</source>
-        <translation type="unfinished"/>
+        <translation>Bläddra efter delningsfil</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Lösenord</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Visa/Dölj lösenordet</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Öppna/Stäng lösenordsgeneratorn</translation>
     </message>
     <message>
         <source>Clear fields</source>
-        <translation type="unfinished"/>
+        <translation>Rensa</translation>
     </message>
 </context>
 <context>
@@ -2881,35 +2893,35 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
-        <translation>Anv&amp;änd standard autoskrivsekvens</translation>
+        <translation>Anv&amp;ge standard autoskrivsekvens</translation>
     </message>
     <message>
         <source>Name field</source>
-        <translation type="unfinished"/>
+        <translation>Namn</translation>
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Anteckningar</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation type="unfinished"/>
+        <translation>Förfallodag på/av</translation>
     </message>
     <message>
         <source>Auto-Type toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Autoskriv på/av för denna grupp och undergrupper</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Förfallodag</translation>
     </message>
     <message>
         <source>Search toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Sökning på/av för denna grupp och undergrupper</translation>
     </message>
     <message>
         <source>Default auto-type sequence field</source>
-        <translation type="unfinished"/>
+        <translation>Standard autoskrivsekvens</translation>
     </message>
 </context>
 <context>
@@ -2976,39 +2988,39 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
-        <translation type="unfinished"/>
+        <translation>Du kan aktivera ikontjänsten från DuckDuckGo under Verktyg -&gt; Inställningar -&gt; Säkerhet</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Ladda ner favicon för URL:en</translation>
     </message>
     <message>
         <source>Apply selected icon to subgroups and entries</source>
-        <translation type="unfinished"/>
+        <translation>Använd markerad ikon till undergrupper och poster</translation>
     </message>
     <message>
         <source>Apply icon &amp;to ...</source>
-        <translation type="unfinished"/>
+        <translation>Använd ikon &amp;till...</translation>
     </message>
     <message>
         <source>Apply to this only</source>
-        <translation type="unfinished"/>
+        <translation>Använd endast till denna</translation>
     </message>
     <message>
         <source>Also apply to child groups</source>
-        <translation type="unfinished"/>
+        <translation>Använd även till undergrupper</translation>
     </message>
     <message>
         <source>Also apply to child entries</source>
-        <translation type="unfinished"/>
+        <translation>Använd även till underposter</translation>
     </message>
     <message>
         <source>Also apply to all children</source>
-        <translation type="unfinished"/>
+        <translation>Använd även till alla undergrupper/-poster</translation>
     </message>
     <message>
         <source>Existing icon selected.</source>
-        <translation type="unfinished"/>
+        <translation>Befintlig ikon vald.</translation>
     </message>
 </context>
 <context>
@@ -3057,27 +3069,27 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     </message>
     <message>
         <source>Datetime created</source>
-        <translation type="unfinished"/>
+        <translation>Skapad datum/tid</translation>
     </message>
     <message>
         <source>Datetime modified</source>
-        <translation type="unfinished"/>
+        <translation>Ändrad datum/tid</translation>
     </message>
     <message>
         <source>Datetime accessed</source>
-        <translation type="unfinished"/>
+        <translation>Använd datum/tid</translation>
     </message>
     <message>
         <source>Unique ID</source>
-        <translation type="unfinished"/>
+        <translation>Unikt ID</translation>
     </message>
     <message>
         <source>Plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Tilläggsdata</translation>
     </message>
     <message>
         <source>Remove selected plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort markerad tilläggsdata</translation>
     </message>
 </context>
 <context>
@@ -3180,19 +3192,19 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     </message>
     <message>
         <source>Add new attachment</source>
-        <translation type="unfinished"/>
+        <translation>Lägg tillny bilaga</translation>
     </message>
     <message>
         <source>Remove selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort markerad bilaga</translation>
     </message>
     <message>
         <source>Open selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Öppna markerad bilaga</translation>
     </message>
     <message>
         <source>Save selected attachment to disk</source>
-        <translation type="unfinished"/>
+        <translation>Spara markerad bilaga på disk</translation>
     </message>
 </context>
 <context>
@@ -3374,7 +3386,7 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     </message>
     <message>
         <source>Display current TOTP value</source>
-        <translation type="unfinished"/>
+        <translation>Visa aktuellt TOTP-värde</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -3401,7 +3413,7 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     </message>
     <message>
         <source>Fit to contents</source>
-        <translation>Anpassa för innehåll</translation>
+        <translation>Anpassa till innehåll</translation>
     </message>
     <message>
         <source>Reset to defaults</source>
@@ -3416,26 +3428,26 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     <name>FdoSecrets::Item</name>
     <message>
         <source>Entry &quot;%1&quot; from database &quot;%2&quot; was used by %3</source>
-        <translation type="unfinished"/>
+        <translation>Posten &quot;%1&quot; från databas &quot;%2&quot; har använts av %3</translation>
     </message>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
     <message>
         <source>Failed to register DBus service at %1: another secret service is running.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte registrera DBus-tjänsten vid %1. En annan &quot;Secret Service&quot; körs redan.</translation>
     </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n post användes av %1</numerusform><numerusform>%n poster användes av %1</numerusform></translation>
     </message>
 </context>
 <context>
     <name>FdoSecretsPlugin</name>
     <message>
         <source>Fdo Secret Service: %1</source>
-        <translation type="unfinished"/>
+        <translation>Fd.o Secret Service: %1</translation>
     </message>
 </context>
 <context>
@@ -3450,7 +3462,7 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     <name>HostInstaller</name>
     <message>
         <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC: Kan inte spara fil!</translation>
+        <translation>KeePassXC: Kan inte spara filen!</translation>
     </message>
     <message>
         <source>Cannot save the native messaging script file.</source>
@@ -3461,7 +3473,7 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation type="unfinished"/>
+        <translation>Ladda ner faviconer</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -3470,7 +3482,8 @@ Det kan medföra att de berörda tilläggen inte fungerar.</translation>
     <message>
         <source>Having trouble downloading icons?
 You can enable the DuckDuckGo website icon service in the security section of the application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Har du problem att ladda ner ikoner?
+Du kan aktivera ikontjänsten från DuckDuckGo, i säkerhetssektionen av programinställningarna.</translation>
     </message>
     <message>
         <source>Close</source>
@@ -3486,11 +3499,11 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Please wait, processing entry list...</source>
-        <translation type="unfinished"/>
+        <translation>Vänta, postlistan bearbetas...</translation>
     </message>
     <message>
         <source>Downloading...</source>
-        <translation type="unfinished"/>
+        <translation>Laddar ner...</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -3498,15 +3511,15 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Already Exists</source>
-        <translation type="unfinished"/>
+        <translation>Finns redan</translation>
     </message>
     <message>
         <source>Download Failed</source>
-        <translation type="unfinished"/>
+        <translation>Nerladdning misslyckades</translation>
     </message>
     <message>
         <source>Downloading favicons (%1/%2)...</source>
-        <translation type="unfinished"/>
+        <translation>Laddar ner faviconer (%1/%2)...</translation>
     </message>
 </context>
 <context>
@@ -3517,7 +3530,7 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Close message</source>
-        <translation>Stäng meddelande</translation>
+        <translation>Stäng meddelandet</translation>
     </message>
 </context>
 <context>
@@ -3553,7 +3566,8 @@ You can enable the DuckDuckGo website icon service in the security section of th
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltiga autentiseringsuppgifter angavs. Försök igen.
+Om detta upprepas, kan din databasfil vara skadad.</translation>
     </message>
 </context>
 <context>
@@ -3688,11 +3702,12 @@ If this reoccurs, then your database file may be corrupt.</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltiga autentiseringsuppgifter angavs. Försök igen.
+Om detta upprepas, kan din databasfil vara skadad.</translation>
     </message>
     <message>
         <source>(HMAC mismatch)</source>
-        <translation type="unfinished"/>
+        <translation>(HMAC matchningsfel)</translation>
     </message>
 </context>
 <context>
@@ -3720,7 +3735,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     <name>KdbxReader</name>
     <message>
         <source>Unsupported cipher</source>
-        <translation>Chiffer som inte stöds</translation>
+        <translation>Chiffret stöds inte</translation>
     </message>
     <message>
         <source>Invalid compression flags length</source>
@@ -3774,11 +3789,11 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
     </message>
     <message>
         <source>Invalid cipher uuid length: %1 (length=%2)</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig uuid-längd för chiffer: %1 (längd=%2)</translation>
     </message>
     <message>
         <source>Unable to parse UUID: %1</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte tolka UUID: %1</translation>
     </message>
     <message>
         <source>Failed to read database file.</source>
@@ -3845,7 +3860,7 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
     </message>
     <message>
         <source>History element in history entry</source>
-        <translation type="unfinished"/>
+        <translation>Historikelement i historikpost</translation>
     </message>
     <message>
         <source>No entry uuid found</source>
@@ -3902,7 +3917,7 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
     <message>
         <source>Unable to decompress binary</source>
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
-        <translation type="unfinished"/>
+        <translation>Kunde inte dekomprimera  binären.</translation>
     </message>
     <message>
         <source>XML error:
@@ -3915,11 +3930,11 @@ Line %2, column %3</source>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Kunde inte öppna databas.</translation>
+        <translation>Kan inte öppna databasen.</translation>
     </message>
     <message>
         <source>Import KeePass1 Database</source>
-        <translation type="unfinished"/>
+        <translation>Importera KeePass1-databas</translation>
     </message>
 </context>
 <context>
@@ -4076,54 +4091,55 @@ Line %2, column %3</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltiga autentiseringsuppgifter angavs. Försök igen.
+Om detta upprepas, kan din databasfil vara skadad.</translation>
     </message>
 </context>
 <context>
     <name>KeeShare</name>
     <message>
         <source>Invalid sharing reference</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig delningsreferens</translation>
     </message>
     <message>
         <source>Inactive share %1</source>
-        <translation type="unfinished"/>
+        <translation>Inaktiv delning %1</translation>
     </message>
     <message>
         <source>Imported from %1</source>
-        <translation>Importerad ifrån %1</translation>
+        <translation>Importerat från %1</translation>
     </message>
     <message>
         <source>Exported to %1</source>
-        <translation type="unfinished"/>
+        <translation>Exporterat till %1</translation>
     </message>
     <message>
         <source>Synchronized with %1</source>
-        <translation type="unfinished"/>
+        <translation>Synkroniserat med %1</translation>
     </message>
     <message>
         <source>Import is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Import är inaktiverat i inställningarna</translation>
     </message>
     <message>
         <source>Export is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Export är inaktiverat i inställningarna</translation>
     </message>
     <message>
         <source>Inactive share</source>
-        <translation type="unfinished"/>
+        <translation>Inaktiv delning</translation>
     </message>
     <message>
         <source>Imported from</source>
-        <translation type="unfinished"/>
+        <translation>Importerat från</translation>
     </message>
     <message>
         <source>Exported to</source>
-        <translation type="unfinished"/>
+        <translation>Exporterat till</translation>
     </message>
     <message>
         <source>Synchronized with</source>
-        <translation type="unfinished"/>
+        <translation>Synkroniserat med</translation>
     </message>
 </context>
 <context>
@@ -4224,11 +4240,11 @@ Meddelande: %2</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Nyckelfiler</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Bläddra efter nyckelfil</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -4236,28 +4252,29 @@ Meddelande: %2</translation>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation type="unfinished"/>
+        <translation>Generera en ny nyckelfil</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
+        <translation>OBS! Använd inte en fil som kanske kommer att modifieras, eftersom det kommer att förhindra upplåsning av databasen!</translation>
     </message>
     <message>
         <source>Invalid Key File</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig nyckelfil</translation>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>Du kan inte använda den aktuella databasen som sin egen nyckelfil. Välj en annan fil eller generera en ny nyckelfil.</translation>
     </message>
     <message>
         <source>Suspicious Key File</source>
-        <translation type="unfinished"/>
+        <translation>Misstänkt nyckelfil</translation>
     </message>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation type="unfinished"/>
+        <translation>Den valda filen ser ut som en lösenordsdatabas. En nyckelfil måste vara en statisk fil som aldrig ändras, annars förlorar du åtkomst till databasen för alltid.
+Vill du verkligen fortsätta med den här filen?</translation>
     </message>
 </context>
 <context>
@@ -4535,8 +4552,8 @@ Vi rekommenderar att du använder tillgänglig AppImage, från vår nerladdnings
     <message>
         <source>NOTE: You are using a pre-release version of KeePassXC!
 Expect some bugs and minor issues, this version is not meant for production use.</source>
-        <translation>NOTIS: Du använder en förhandsversion av KeePassXC!
-Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för daglig användning.</translation>
+        <translation>OBS! Du använder en förhandsversion av KeePassXC!
+Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dagligt bruk.</translation>
     </message>
     <message>
         <source>Check for updates on startup?</source>
@@ -4552,27 +4569,27 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exportera</translation>
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Sök efter uppdateringar...</translation>
     </message>
     <message>
         <source>Downlo&amp;ad all favicons</source>
-        <translation type="unfinished"/>
+        <translation>Ladda ner alla &amp;faviconer</translation>
     </message>
     <message>
         <source>Sort &amp;A-Z</source>
-        <translation type="unfinished"/>
+        <translation>Sortera &amp;A-Z</translation>
     </message>
     <message>
         <source>Sort &amp;Z-A</source>
-        <translation type="unfinished"/>
+        <translation>Sortera &amp;Z-A</translation>
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Lösenordsgenerator</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4580,43 +4597,43 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>&amp;Export to HTML file...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exportera till HTML-fil...</translation>
     </message>
     <message>
         <source>1Password Vault...</source>
-        <translation type="unfinished"/>
+        <translation>1Password-valv...</translation>
     </message>
     <message>
         <source>Import a 1Password Vault</source>
-        <translation type="unfinished"/>
+        <translation>Importera ett 1Password-valv</translation>
     </message>
     <message>
         <source>&amp;Getting Started</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Kom igång</translation>
     </message>
     <message>
         <source>Open Getting Started Guide PDF</source>
-        <translation type="unfinished"/>
+        <translation>Öppna kom-igång-manualen som PDF</translation>
     </message>
     <message>
         <source>&amp;Online Help...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Online-hjälp...</translation>
     </message>
     <message>
         <source>Go to online documentation (opens browser)</source>
-        <translation type="unfinished"/>
+        <translation>Gå till online-dokumentationen (öppnas i webbläsaren)</translation>
     </message>
     <message>
         <source>&amp;User Guide</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Användarmanual</translation>
     </message>
     <message>
         <source>Open User Guide PDF</source>
-        <translation type="unfinished"/>
+        <translation>Öppna användarmanualen som PDF</translation>
     </message>
     <message>
         <source>&amp;Keyboard Shortcuts</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tangentbordsgenvägar</translation>
     </message>
 </context>
 <context>
@@ -4679,11 +4696,11 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>Removed custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Tog bort anpassad data %1 [%2]</translation>
     </message>
     <message>
         <source>Adding custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Lägger till anpassad data %1 [%2]</translation>
     </message>
 </context>
 <context>
@@ -4751,38 +4768,38 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>Please fill in the display name and an optional description for your new database:</source>
-        <translation>Fyll i visningsnamnet och en frivillig beskrivning för din nya databas.</translation>
+        <translation>Fyll i visningsnamnet och en frivillig beskrivning för din nya databas:</translation>
     </message>
 </context>
 <context>
     <name>OpData01</name>
     <message>
         <source>Invalid OpData01, does not contain header</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig OpData01, innehåller inget huvud</translation>
     </message>
     <message>
         <source>Unable to read all IV bytes, wanted 16 but got %1</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte läsa alla IV-byte, förväntade 16 men fick %1</translation>
     </message>
     <message>
         <source>Unable to init cipher for opdata01: %1</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte initiera chiffer för opdata01: %1</translation>
     </message>
     <message>
         <source>Unable to read all HMAC signature bytes</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte läsa alla byte i HMAC signatur</translation>
     </message>
     <message>
         <source>Malformed OpData01 due to a failed HMAC</source>
-        <translation type="unfinished"/>
+        <translation>Felaktigt formaterad OpData01 på grund av en misslyckad HMAC</translation>
     </message>
     <message>
         <source>Unable to process clearText in place</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte att bearbeta klartext på plats</translation>
     </message>
     <message>
         <source>Expected %1 bytes of clear-text, found %2</source>
-        <translation type="unfinished"/>
+        <translation>Förväntade %1 byte klartext, hittade %2</translation>
     </message>
 </context>
 <context>
@@ -4790,34 +4807,35 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     <message>
         <source>Read Database did not produce an instance
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Läsning av databas producerade inte någon instans
+%1</translation>
     </message>
 </context>
 <context>
     <name>OpVaultReader</name>
     <message>
         <source>Directory .opvault must exist</source>
-        <translation type="unfinished"/>
+        <translation>Mappen .opvault måste finnas</translation>
     </message>
     <message>
         <source>Directory .opvault must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Mappen .opvault måste vara läsbar</translation>
     </message>
     <message>
         <source>Directory .opvault/default must exist</source>
-        <translation type="unfinished"/>
+        <translation>Mappen .opvault/default måste finnas</translation>
     </message>
     <message>
         <source>Directory .opvault/default must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Mappen .opvault/default måste vara läsbar</translation>
     </message>
     <message>
         <source>Unable to decode masterKey: %1</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte avkoda huvudnyckel: %1</translation>
     </message>
     <message>
         <source>Unable to derive master key: %1</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte härleda huvudnyckel: %1</translation>
     </message>
 </context>
 <context>
@@ -4923,11 +4941,11 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     <name>PasswordEdit</name>
     <message>
         <source>Passwords do not match</source>
-        <translation type="unfinished"/>
+        <translation>Lösenorden stämmer inte överens</translation>
     </message>
     <message>
         <source>Passwords match so far</source>
-        <translation type="unfinished"/>
+        <translation>Lösenorden stämmer så långt</translation>
     </message>
 </context>
 <context>
@@ -4958,19 +4976,19 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Lösenord</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Visa/Dölj lösenordet</translation>
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Upprepa lösenordet</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Lösenordsgenerator på/av</translation>
     </message>
 </context>
 <context>
@@ -5046,7 +5064,7 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>Entropy: %1 bit</source>
-        <translation>Entropi: %1 bit</translation>
+        <translation>Entropi: %1 bitar</translation>
     </message>
     <message>
         <source>Password Quality: %1</source>
@@ -5170,75 +5188,75 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>Regenerate</source>
-        <translation>Återgenerera</translation>
+        <translation>Generera om</translation>
     </message>
     <message>
         <source>Generated password</source>
-        <translation type="unfinished"/>
+        <translation>Genererat lösenord</translation>
     </message>
     <message>
         <source>Upper-case letters</source>
-        <translation type="unfinished"/>
+        <translation>VERSALER</translation>
     </message>
     <message>
         <source>Lower-case letters</source>
-        <translation type="unfinished"/>
+        <translation>gemener</translation>
     </message>
     <message>
         <source>Special characters</source>
-        <translation type="unfinished"/>
+        <translation>Specialtecken</translation>
     </message>
     <message>
         <source>Math Symbols</source>
-        <translation type="unfinished"/>
+        <translation>Mattematiksymboler</translation>
     </message>
     <message>
         <source>Dashes and Slashes</source>
-        <translation type="unfinished"/>
+        <translation>Streck och snedstreck</translation>
     </message>
     <message>
         <source>Excluded characters</source>
-        <translation type="unfinished"/>
+        <translation>Undantagna tecken</translation>
     </message>
     <message>
         <source>Hex Passwords</source>
-        <translation type="unfinished"/>
+        <translation>Hexadecimala lösenord</translation>
     </message>
     <message>
         <source>Password length</source>
-        <translation type="unfinished"/>
+        <translation>Lösenordslängd</translation>
     </message>
     <message>
         <source>Word Case:</source>
-        <translation type="unfinished"/>
+        <translation>Skiftläge:</translation>
     </message>
     <message>
         <source>Regenerate password</source>
-        <translation type="unfinished"/>
+        <translation>Generera om lösenordet</translation>
     </message>
     <message>
         <source>Copy password</source>
-        <translation>Kopiera lösenord</translation>
+        <translation>Kopiera lösenordet</translation>
     </message>
     <message>
         <source>Accept password</source>
-        <translation type="unfinished"/>
+        <translation>Acceptera lösenordet</translation>
     </message>
     <message>
         <source>lower case</source>
-        <translation type="unfinished"/>
+        <translation>gemener</translation>
     </message>
     <message>
         <source>UPPER CASE</source>
-        <translation type="unfinished"/>
+        <translation>VERSALER</translation>
     </message>
     <message>
         <source>Title Case</source>
-        <translation type="unfinished"/>
+        <translation>Titelns skiftläge</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Visa/Dölj lösenordet</translation>
     </message>
 </context>
 <context>
@@ -5249,7 +5267,7 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Statistik</translation>
     </message>
 </context>
 <context>
@@ -5288,7 +5306,7 @@ Vissa fel och mindre problem kan uppstå. Denna version är inte ämnad för dag
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"/>
+        <translation>Fortsätt</translation>
     </message>
 </context>
 <context>
@@ -5500,7 +5518,7 @@ Tillgängliga kommandon:
     </message>
     <message>
         <source>Name of the entry to show.</source>
-        <translation>Namn på posten som skall visas.</translation>
+        <translation>Visningsnamn för posten.</translation>
     </message>
     <message>
         <source>NULL device</source>
@@ -5983,15 +6001,15 @@ Tillgängliga kommandon:
     </message>
     <message>
         <source>Deactivate password key for the database.</source>
-        <translation type="unfinished"/>
+        <translation>Inaktivera lösenordsnyckeln för databasen.</translation>
     </message>
     <message>
         <source>Displays debugging information.</source>
-        <translation type="unfinished"/>
+        <translation>Visa felsökningsinformation.</translation>
     </message>
     <message>
         <source>Deactivate password key for the database to merge from.</source>
-        <translation type="unfinished"/>
+        <translation>Avaktivera lösenordsnyckel för databas som infogas ifrån.</translation>
     </message>
     <message>
         <source>Version %1</source>
@@ -5999,23 +6017,23 @@ Tillgängliga kommandon:
     </message>
     <message>
         <source>Build Type: %1</source>
-        <translation>Build Type: %1</translation>
+        <translation>Kompileringstyp: %1</translation>
     </message>
     <message>
         <source>Revision: %1</source>
-        <translation>Ändring: %1</translation>
+        <translation>Revision: %1</translation>
     </message>
     <message>
         <source>Distribution: %1</source>
-        <translation>Utdelning: %1</translation>
+        <translation>Distribution: %1</translation>
     </message>
     <message>
         <source>Debugging mode is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Felsökningsläget är inaktiverat.</translation>
     </message>
     <message>
         <source>Debugging mode is enabled.</source>
-        <translation type="unfinished"/>
+        <translation>Felsökningsläget är aktiverat.</translation>
     </message>
     <message>
         <source>Operating system: %1
@@ -6059,151 +6077,151 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Cryptographic libraries:</source>
-        <translation type="unfinished"/>
+        <translation>Kryptografiska bibliotek:</translation>
     </message>
     <message>
         <source>Cannot generate a password and prompt at the same time!</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte generera lösenord och fråga på samma gång!</translation>
     </message>
     <message>
         <source>Adds a new group to a database.</source>
-        <translation type="unfinished"/>
+        <translation>Lägger till en ny grupp i en databas.</translation>
     </message>
     <message>
         <source>Path of the group to add.</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg till gruppen som läggs till.</translation>
     </message>
     <message>
         <source>Group %1 already exists!</source>
-        <translation type="unfinished"/>
+        <translation>Gruppen %1 finns redan!</translation>
     </message>
     <message>
         <source>Group %1 not found.</source>
-        <translation type="unfinished"/>
+        <translation>Gruppen %1 hittades inte.</translation>
     </message>
     <message>
         <source>Successfully added group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Lade till gruppen %1.</translation>
     </message>
     <message>
         <source>Check if any passwords have been publicly leaked. FILENAME must be the path of a file listing SHA-1 hashes of leaked passwords in HIBP format, as available from https://haveibeenpwned.com/Passwords.</source>
-        <translation type="unfinished"/>
+        <translation>Kontrollera om om några lösenord har läckt ut offentligt. FILNAMN måste vara sökvägen till en SHA-1-hashad fillista med läckta lösenord i HIBP-format, såsom tillgänglig från https://haveibeenpwned.com/Passwords.</translation>
     </message>
     <message>
         <source>FILENAME</source>
-        <translation type="unfinished"/>
+        <translation>FILNAMN</translation>
     </message>
     <message>
         <source>Analyze passwords for weaknesses and problems.</source>
-        <translation type="unfinished"/>
+        <translation>Analysera lösenord efter svagheter och problem.</translation>
     </message>
     <message>
         <source>Failed to open HIBP file %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte öppna HIBP-filen %1: %2</translation>
     </message>
     <message>
         <source>Evaluating database entries against HIBP file, this will take a while...</source>
-        <translation type="unfinished"/>
+        <translation>Utvärderar databasposter mot HIBP-fil. Detta kommer att ta en stund...</translation>
     </message>
     <message>
         <source>Close the currently opened database.</source>
-        <translation type="unfinished"/>
+        <translation>Stäng den öppna databasen.</translation>
     </message>
     <message>
         <source>Display this help.</source>
-        <translation type="unfinished"/>
+        <translation>Visa den här hjälpen.</translation>
     </message>
     <message>
         <source>Yubikey slot used to encrypt the database.</source>
-        <translation type="unfinished"/>
+        <translation>Yubikey-plats som används för att kryptera databasen.</translation>
     </message>
     <message>
         <source>slot</source>
-        <translation type="unfinished"/>
+        <translation>anslutningsplats</translation>
     </message>
     <message>
         <source>Invalid word count %1</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt antal ord %1</translation>
     </message>
     <message>
         <source>The word list is too small (&lt; 1000 items)</source>
-        <translation type="unfinished"/>
+        <translation>Ordlistan är för liten (&lt;1000 objekt)</translation>
     </message>
     <message>
         <source>Exit interactive mode.</source>
-        <translation type="unfinished"/>
+        <translation>Avsluta interaktivt läge.</translation>
     </message>
     <message>
         <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
-        <translation type="unfinished"/>
+        <translation>Format att använda för export. Tillgängliga alternativ är XML eller CSV. Standard är XML.</translation>
     </message>
     <message>
         <source>Exports the content of a database to standard output in the specified format.</source>
-        <translation type="unfinished"/>
+        <translation>Exporterar innehållet i en databas till standardutdata i angivet format.</translation>
     </message>
     <message>
         <source>Unable to export database to XML: %1</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte exportera databas till XML: %1</translation>
     </message>
     <message>
         <source>Unsupported format %1</source>
-        <translation type="unfinished"/>
+        <translation>Formatet stöd inte, %1</translation>
     </message>
     <message>
         <source>Use numbers</source>
-        <translation type="unfinished"/>
+        <translation>Använd siffror</translation>
     </message>
     <message>
         <source>Invalid password length %1</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig lösenordslängd %1</translation>
     </message>
     <message>
         <source>Display command help.</source>
-        <translation type="unfinished"/>
+        <translation>Visa kommandohjälp.</translation>
     </message>
     <message>
         <source>Available commands:</source>
-        <translation type="unfinished"/>
+        <translation>Tillgängliga kommandon:</translation>
     </message>
     <message>
         <source>Import the contents of an XML database.</source>
-        <translation type="unfinished"/>
+        <translation>Importera innehållet från en XML-databas.</translation>
     </message>
     <message>
         <source>Path of the XML database export.</source>
-        <translation type="unfinished"/>
+        <translation>Målsökväg för XML-databasexport.</translation>
     </message>
     <message>
         <source>Path of the new database.</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg till den nya databasen.</translation>
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte importera XML-databasexport %1</translation>
     </message>
     <message>
         <source>Successfully imported database.</source>
-        <translation type="unfinished"/>
+        <translation>Databas importera.</translation>
     </message>
     <message>
         <source>Unknown command %1</source>
-        <translation type="unfinished"/>
+        <translation>Okänt kommando %1</translation>
     </message>
     <message>
         <source>Flattens the output to single lines.</source>
-        <translation type="unfinished"/>
+        <translation>Slätar ut utdata till enkelrader.</translation>
     </message>
     <message>
         <source>Only print the changes detected by the merge operation.</source>
-        <translation type="unfinished"/>
+        <translation>Skriv bara ut de ändringar som upptäckts av sammanfogningsoperationen.</translation>
     </message>
     <message>
         <source>Yubikey slot for the second database.</source>
-        <translation type="unfinished"/>
+        <translation>Yubikey-plats för den andra databasen.</translation>
     </message>
     <message>
         <source>Successfully merged %1 into %2.</source>
-        <translation type="unfinished"/>
+        <translation>Infogade %1 i %2.</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
@@ -6211,103 +6229,103 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Moves an entry to a new group.</source>
-        <translation type="unfinished"/>
+        <translation>Flyttar en post till ny grupp.</translation>
     </message>
     <message>
         <source>Path of the entry to move.</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg till posten som skall flyttas.</translation>
     </message>
     <message>
         <source>Path of the destination group.</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg till målgruppen.</translation>
     </message>
     <message>
         <source>Could not find group with path %1.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte hitta någon grupp med sökväg %1.</translation>
     </message>
     <message>
         <source>Entry is already in group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Posten finns redan i gruppen %1.</translation>
     </message>
     <message>
         <source>Successfully moved entry %1 to group %2.</source>
-        <translation type="unfinished"/>
+        <translation>Flyttade posten %1 till gruppen %2.</translation>
     </message>
     <message>
         <source>Open a database.</source>
-        <translation type="unfinished"/>
+        <translation>Öppna en databas.</translation>
     </message>
     <message>
         <source>Path of the group to remove.</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg till gruppen som skall tas bort.</translation>
     </message>
     <message>
         <source>Cannot remove root group from database.</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte ta bort root-gruppen från databasen.</translation>
     </message>
     <message>
         <source>Successfully recycled group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Gruppen %1 har återvunnits.</translation>
     </message>
     <message>
         <source>Successfully deleted group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Gruppen %1 har tagits bort.</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not found</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte öppna databasfilen %1: Hittades inte</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not a plain file</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte öppna databasfilen %1: Ingen vanlig fil</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not readable</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte öppna databasfilen %1: Inte läsbar</translation>
     </message>
     <message>
         <source>Enter password to unlock %1: </source>
-        <translation type="unfinished"/>
+        <translation>Ange lösenord för att låsa upp %1: </translation>
     </message>
     <message>
         <source>Invalid YubiKey slot %1</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig YubiKey-plats %1</translation>
     </message>
     <message>
         <source>Please touch the button on your YubiKey to unlock %1</source>
-        <translation type="unfinished"/>
+        <translation>Rör vid knappen på din YubiKey för att låsa upp %1</translation>
     </message>
     <message>
         <source>Enter password to encrypt database (optional): </source>
-        <translation type="unfinished"/>
+        <translation>Ange lösenord för att avkryptera databasen (valfritt): </translation>
     </message>
     <message>
         <source>HIBP file, line %1: parse error</source>
-        <translation type="unfinished"/>
+        <translation>HIBP-fil, rad %1: tolkningsfel</translation>
     </message>
     <message>
         <source>Secret Service Integration</source>
-        <translation type="unfinished"/>
+        <translation>Secret Service-integration</translation>
     </message>
     <message>
         <source>User name</source>
-        <translation type="unfinished"/>
+        <translation>Användarnamn</translation>
     </message>
     <message>
         <source>%1[%2] Challenge Response - Slot %3 - %4</source>
-        <translation type="unfinished"/>
+        <translation>%1[%2] Challenge Response - Plats %3 - %4</translation>
     </message>
     <message numerus="yes">
         <source>Password for &apos;%1&apos; has been leaked %2 time(s)!</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Lösenordet för &quot;%1&quot; har läckts ut %2 gång!</numerusform><numerusform>Lösenordet för &quot;%1&quot; har läckts ut %2 gånger!</numerusform></translation>
     </message>
     <message>
         <source>Invalid password generator after applying all options</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig lösenordsgenerator efter tillämpning av alla alternativ</translation>
     </message>
     <message>
         <source>Show the protected attributes in clear text.</source>
-        <translation type="unfinished"/>
+        <translation>Visa de skyddade attributen i klartext.</translation>
     </message>
 </context>
 <context>
@@ -6348,7 +6366,7 @@ Kärna: %3 %4</translation>
     <name>SSHAgent</name>
     <message>
         <source>Agent connection failed.</source>
-        <translation>Tjänstanslutning misslyckades.</translation>
+        <translation>Anslutning till tjänsten misslyckades.</translation>
     </message>
     <message>
         <source>Agent protocol error.</source>
@@ -6466,11 +6484,11 @@ Kärna: %3 %4</translation>
     <name>SettingsWidgetFdoSecrets</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"/>
+        <translation>Alternativ</translation>
     </message>
     <message>
         <source>Enable KeepassXC Freedesktop.org Secret Service integration</source>
-        <translation type="unfinished"/>
+        <translation>Aktivera KeePassXC Secret Service-integration från Freedesktop.org</translation>
     </message>
     <message>
         <source>General</source>
@@ -6478,23 +6496,23 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Show notification when credentials are requested</source>
-        <translation type="unfinished"/>
+        <translation>Visa avisering när autentiseringsuppgifter begärs</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om papperskorgen är aktiverad för databasen, kommer posterna att flyttas direkt till papperskorgen. Annars kommer de att tas bort utan bekräftelse.&lt;/p&gt;&lt;p&gt;Du kommer fortfarande att tillfrågas om några poster refereras av andra.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation type="unfinished"/>
+        <translation>Be inte om bekräftelse när poster tas bort av klienter.</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
-        <translation type="unfinished"/>
+        <translation>Exponerade databasgrupper:</translation>
     </message>
     <message>
         <source>File Name</source>
-        <translation type="unfinished"/>
+        <translation>Filnamn</translation>
     </message>
     <message>
         <source>Group</source>
@@ -6502,23 +6520,23 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Manage</source>
-        <translation type="unfinished"/>
+        <translation>Hantera</translation>
     </message>
     <message>
         <source>Authorization</source>
-        <translation type="unfinished"/>
+        <translation>Auktorisation</translation>
     </message>
     <message>
         <source>These applications are currently connected:</source>
-        <translation type="unfinished"/>
+        <translation>Dessa program är för närvarande anslutna:</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished"/>
+        <translation>Program</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"/>
+        <translation>Kopla ifrån</translation>
     </message>
     <message>
         <source>Database settings</source>
@@ -6526,15 +6544,15 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Edit database settings</source>
-        <translation type="unfinished"/>
+        <translation>Avsluta databasinställningar</translation>
     </message>
     <message>
         <source>Unlock database</source>
-        <translation>Lås upp databas</translation>
+        <translation>Lås upp databasen</translation>
     </message>
     <message>
         <source>Unlock database to show more information</source>
-        <translation type="unfinished"/>
+        <translation>Lås upp databasen för att visa mer information</translation>
     </message>
     <message>
         <source>Lock database</source>
@@ -6542,7 +6560,7 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Unlock to show</source>
-        <translation type="unfinished"/>
+        <translation>Lås upp för att visa</translation>
     </message>
     <message>
         <source>None</source>
@@ -6674,15 +6692,15 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Allow KeeShare imports</source>
-        <translation type="unfinished"/>
+        <translation>Tillåt KeeShare-import</translation>
     </message>
     <message>
         <source>Allow KeeShare exports</source>
-        <translation type="unfinished"/>
+        <translation>Tillåt KeeShare-export</translation>
     </message>
     <message>
         <source>Only show warnings and errors</source>
-        <translation type="unfinished"/>
+        <translation>Visa bara varningar och fel</translation>
     </message>
     <message>
         <source>Key</source>
@@ -6690,39 +6708,39 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Signer name field</source>
-        <translation type="unfinished"/>
+        <translation>Undertecknarens namn</translation>
     </message>
     <message>
         <source>Generate new certificate</source>
-        <translation type="unfinished"/>
+        <translation>Generera nytt certifikat</translation>
     </message>
     <message>
         <source>Import existing certificate</source>
-        <translation type="unfinished"/>
+        <translation>Importera befintligt certifikat</translation>
     </message>
     <message>
         <source>Export own certificate</source>
-        <translation type="unfinished"/>
+        <translation>Exportera eget certifikat</translation>
     </message>
     <message>
         <source>Known shares</source>
-        <translation type="unfinished"/>
+        <translation>Kända delningar</translation>
     </message>
     <message>
         <source>Trust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Lita på markerat certifikat</translation>
     </message>
     <message>
         <source>Ask whether to trust the selected certificate every time</source>
-        <translation type="unfinished"/>
+        <translation>Fråga om markerat certifikat alltid skall betraktas som pålitligt varje gång</translation>
     </message>
     <message>
         <source>Untrust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Lita inte på markerat certifikat</translation>
     </message>
     <message>
         <source>Remove selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Ta bort markerat certifikat</translation>
     </message>
 </context>
 <context>
@@ -6906,7 +6924,7 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>There was an error creating the QR code.</source>
-        <translation>Det uppstod ett fel vid skapandet av QR-koden.</translation>
+        <translation>Det uppstod ett fel när QR-koden skapades.</translation>
     </message>
     <message>
         <source>Closing in %1 seconds.</source>
@@ -6950,44 +6968,45 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Secret Key:</source>
-        <translation type="unfinished"/>
+        <translation>Hemlig nyckel:</translation>
     </message>
     <message>
         <source>Secret key must be in Base32 format</source>
-        <translation type="unfinished"/>
+        <translation>En hemlig nyckel måste vara i Base32-format</translation>
     </message>
     <message>
         <source>Secret key field</source>
-        <translation type="unfinished"/>
+        <translation>Hemlig nyckel</translation>
     </message>
     <message>
         <source>Algorithm:</source>
-        <translation>Algoritm</translation>
+        <translation>Algoritm:</translation>
     </message>
     <message>
         <source>Time step field</source>
-        <translation type="unfinished"/>
+        <translation>Tidssteg</translation>
     </message>
     <message>
         <source> digits</source>
-        <translation type="unfinished"/>
+        <translation> siffror</translation>
     </message>
     <message>
         <source>Invalid TOTP Secret</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig TOTP-hemlighet</translation>
     </message>
     <message>
         <source>You have entered an invalid secret key. The key must be in Base32 format.
 Example: JBSWY3DPEHPK3PXP</source>
-        <translation type="unfinished"/>
+        <translation>Du har angivit en ogiltig hemlig nyckel. Nyckeln måste vara i Base32-format.
+Exempel: JBSWY3DPEHPK3PXP</translation>
     </message>
     <message>
         <source>Confirm Remove TOTP Settings</source>
-        <translation type="unfinished"/>
+        <translation>Bekräfta borttagning av TOTP-inställningar</translation>
     </message>
     <message>
         <source>Are you sure you want to delete TOTP settings for this entry?</source>
-        <translation type="unfinished"/>
+        <translation>Vill du verkligen ta bort TOTP-inställningarna för den här posten?</translation>
     </message>
 </context>
 <context>
@@ -7073,11 +7092,11 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Importera från 1Password</translation>
     </message>
     <message>
         <source>Open a recent database</source>
-        <translation type="unfinished"/>
+        <translation>Öppna en tidigare databas</translation>
     </message>
 </context>
 <context>
@@ -7104,11 +7123,11 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Uppdatera hårdvaru-tokens</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Hårdvarunyckelplats</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_tr.ts b/share/translations/keepassx_tr.ts
index a8d0c79be6..9567ea4e93 100644
--- a/share/translations/keepassx_tr.ts
+++ b/share/translations/keepassx_tr.ts
@@ -54,7 +54,7 @@
     </message>
     <message>
         <source>Use OpenSSH for Windows instead of Pageant</source>
-        <translation>Pageant yerine Windows için OpenSSH kullan</translation>
+        <translation>Windows için Pageant yerine OpenSSH kullan</translation>
     </message>
 </context>
 <context>
@@ -172,7 +172,7 @@
     </message>
     <message>
         <source>Minimize instead of app exit</source>
-        <translation>Çıkmak yerine simge durumunda küçült</translation>
+        <translation>Uygulamadan çıkmak yerine simge durumuna küçült</translation>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -188,27 +188,27 @@
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Oto-Yazım</translation>
+        <translation>Otomatik Yazım</translation>
     </message>
     <message>
         <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Genel Oto-Yazım için pencereleri karşılaştırmada girdi başlığını kullan</translation>
+        <translation>Genel Otomatik Yazım için pencereleri karşılaştırmada girdi başlığını kullan</translation>
     </message>
     <message>
         <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Genel Oto-Yazım için pencereleri karşılaştırmada girdi URL&apos;sini kullan</translation>
+        <translation>Genel Otomatik Yazım için pencereleri karşılaştırmada girdi URL&apos;sini kullan</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
-        <translation>Oto-Yazım gerçekleştirmeden önce her zaman sor</translation>
+        <translation>Otomatik Yazım gerçekleştirmeden önce her zaman sor</translation>
     </message>
     <message>
         <source>Global Auto-Type shortcut</source>
-        <translation>Genel Oto-Yazım kısayolu</translation>
+        <translation>Genel Otomatik Yazım kısayolu</translation>
     </message>
     <message>
         <source>Auto-Type typing delay</source>
-        <translation>Oto-Yazım yazma gecikmesi</translation>
+        <translation>Otomatik Yazım yazma gecikmesi</translation>
     </message>
     <message>
         <source> ms</source>
@@ -217,7 +217,7 @@
     </message>
     <message>
         <source>Auto-Type start delay</source>
-        <translation>Oto-Yazım başlangıç gecikmesi</translation>
+        <translation>Otomatik Yazım başlangıç gecikmesi</translation>
     </message>
     <message>
         <source>Movable toolbar</source>
@@ -237,11 +237,11 @@
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
-        <translation type="unfinished"/>
+        <translation>Uygulama başlangıcında güncellemeleri haftada bir kontrol et</translation>
     </message>
     <message>
         <source>Include beta releases when checking for updates</source>
-        <translation type="unfinished"/>
+        <translation>Güncellemeleri kontrol ederken beta sürümleri dahil et</translation>
     </message>
     <message>
         <source>Button style:</source>
@@ -253,19 +253,19 @@
     </message>
     <message>
         <source>(restart program to activate)</source>
-        <translation type="unfinished"/>
+        <translation>(etkinleştirmek için programı yeniden başlat)</translation>
     </message>
     <message>
         <source>Minimize window after unlocking database</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı kilidini açınca pencereyi simge durumuna küçült</translation>
     </message>
     <message>
         <source>Minimize when opening a URL</source>
-        <translation type="unfinished"/>
+        <translation>URL açarken simge durumuna küçült</translation>
     </message>
     <message>
         <source>Hide window when copying to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Panoya kopyalarken pencereyi gizle</translation>
     </message>
     <message>
         <source>Minimize</source>
@@ -273,15 +273,15 @@
     </message>
     <message>
         <source>Drop to background</source>
-        <translation type="unfinished"/>
+        <translation>Arkaplana bırak</translation>
     </message>
     <message>
         <source>Favicon download timeout:</source>
-        <translation type="unfinished"/>
+        <translation>Site simgesi indirme zaman aşımı:</translation>
     </message>
     <message>
         <source>Website icon download timeout in seconds</source>
-        <translation type="unfinished"/>
+        <translation>Web sitesi simge indirme zaman aşımı süresi</translation>
     </message>
     <message>
         <source> sec</source>
@@ -290,31 +290,31 @@
     </message>
     <message>
         <source>Toolbar button style</source>
-        <translation type="unfinished"/>
+        <translation>Araç çubuğu düğme tipi</translation>
     </message>
     <message>
         <source>Use monospaced font for Notes</source>
-        <translation type="unfinished"/>
+        <translation>Notlar için eş aralıklı yazı tipi kullan</translation>
     </message>
     <message>
         <source>Language selection</source>
-        <translation type="unfinished"/>
+        <translation>Dil seçimi</translation>
     </message>
     <message>
         <source>Reset Settings to Default</source>
-        <translation type="unfinished"/>
+        <translation>Ayarları Varsayılana Sıfırla</translation>
     </message>
     <message>
         <source>Global auto-type shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Genel otomatik yazım kısayolu</translation>
     </message>
     <message>
         <source>Auto-type character typing delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation>Otomatik yazım karakter yazma gecikmesi milisaniye</translation>
     </message>
     <message>
         <source>Auto-type start delay milliseconds</source>
-        <translation type="unfinished"/>
+        <translation>Otomatik yazım başlangıç gecikmesi milisaniye</translation>
     </message>
 </context>
 <context>
@@ -362,7 +362,7 @@
     </message>
     <message>
         <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Oto-Yazım gerçekleştirdikten sonra önceden kilitli veritabanını yeniden kilitle</translation>
+        <translation>Otomatik Yazım gerçekleştirdikten sonra önceden kilitli veritabanını yeniden kilitle</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
@@ -390,11 +390,11 @@
     </message>
     <message>
         <source>Use DuckDuckGo service to download website icons</source>
-        <translation type="unfinished"/>
+        <translation>Web sitesi simgelerini indirmek için DuckDuckGo kullan</translation>
     </message>
     <message>
         <source>Clipboard clear seconds</source>
-        <translation type="unfinished"/>
+        <translation>Pano temizleme süresi</translation>
     </message>
     <message>
         <source>Touch ID inactivity reset</source>
@@ -402,7 +402,7 @@
     </message>
     <message>
         <source>Database lock timeout seconds</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı kilidi zaman aşımı süresi</translation>
     </message>
     <message>
         <source> min</source>
@@ -411,7 +411,7 @@
     </message>
     <message>
         <source>Clear search query after</source>
-        <translation type="unfinished"/>
+        <translation>Sonrasında arama sorgusunu temizle</translation>
     </message>
 </context>
 <context>
@@ -422,27 +422,27 @@
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Oto-Yazım - KeePassXC</translation>
+        <translation>Otomatik Yazım - KeePassXC</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Oto-Yazım</translation>
+        <translation>Otomatik Yazım</translation>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation>Oto-Yazım ifadenizin sözdizimi yanlış!</translation>
+        <translation>Otomatik Yazım ifadenizin söz dizimi yanlış!</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation>Bu Oto-Yazım komutu çok uzun bir gecikme içeriyor. Gerçekten devam etmek istiyor musun?</translation>
+        <translation>Bu Otomatik Yazım komutu çok uzun bir gecikme içeriyor. Gerçekten devam etmek istiyor musun?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation>Bu Oto-Yazım komutu çok yavaş tuşa basar. Gerçekten devam etmek istiyor musun?</translation>
+        <translation>Bu Otomatik Yazım komutu çok yavaş tuşa basar. Gerçekten devam etmek istiyor musun?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation>Bu Oto-Yazım komutu çok sık tekrarlanan argümanlar içerir. Gerçekten devam etmek istiyor musun?</translation>
+        <translation>Bu Otomatik Yazım komutu çok sık tekrarlanan argümanlar içerir. Gerçekten devam etmek istiyor musun?</translation>
     </message>
     <message>
         <source>Permission Required</source>
@@ -450,7 +450,7 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC, giriş seviyesi Otomatik Yazım gerçekleştirmek için Erişilebilirlik iznine ihtiyaç duyar. Zaten izin verdiyseniz, KeePassXC&apos;yi yeniden başlatmanız gerekebilir.</translation>
     </message>
 </context>
 <context>
@@ -506,18 +506,18 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC, genel Otomatik Yazım gerçekleştirmek için Erişilebilirlik ve Ekran Kaydedici iznine ihtiyaç duyar. Ekran Kaydı, girişleri bulmak için pencere başlığını kullanmak için gereklidir. Zaten izin verdiyseniz, KeePassXC&apos;yi yeniden başlatmanız gerekebilir.</translation>
     </message>
 </context>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Oto-Yazım - KeePassXC</translation>
+        <translation>Otomatik Yazım - KeePassXC</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Oto-Yazım için girdi seçin:</translation>
+        <translation>Otomatik Yazım için girdi seç:</translation>
     </message>
     <message>
         <source>Search...</source>
@@ -532,7 +532,7 @@
     </message>
     <message>
         <source>Remember this decision</source>
-        <translation>Bu kararı hatırla</translation>
+        <translation>Bu kararı anımsa</translation>
     </message>
     <message>
         <source>Allow</source>
@@ -545,8 +545,8 @@
     <message>
         <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
-        <translation>%1, şu öge(ler) için parolalara erişim izni istedi.
-Lütfen erişime izin vermek isteyip istemediğinizi belirtin.</translation>
+        <translation>%1, aşağıdaki ögeler için parola erişimi istiyor.
+Lütfen erişime izin vermek isteyip istemediğinizi seçin.</translation>
     </message>
     <message>
         <source>Allow access</source>
@@ -619,7 +619,7 @@ Lütfen kimlik bilgilerini kaydetmek için doğru veritabanını seç.</translat
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Eğer kilitliyse veritabanının kilidini açma is&amp;teği</translation>
+        <translation>Eğer kilitliyse veritabanının kilidini açma &amp;isteği</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
@@ -627,15 +627,15 @@ Lütfen kimlik bilgilerini kaydetmek için doğru veritabanını seç.</translat
     </message>
     <message>
         <source>&amp;Match URL scheme (e.g., https://...)</source>
-        <translation>&amp;Eşleşme URL şeması (ör., https://...)</translation>
+        <translation>URL şemasını &amp;eşleştir (ör., https://...)</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Yalnızca tüm alan adı için tüm girdiler yerine belirli bir URL için en iyi eşleşenleri döndürür.</translation>
+        <translation>Tüm alan adı için tüm girdiler yerine yalnızca belirli bir URL için en iyi eşleşenleri döndürür.</translation>
     </message>
     <message>
         <source>&amp;Return only best-matching credentials</source>
-        <translation>&amp;Yalnızca en iyi eşleşen kimlik bilgilerini döndür</translation>
+        <translation>Yalnızca en iyi eşleşen girdileri &amp;döndür</translation>
     </message>
     <message>
         <source>Sort &amp;matching credentials by title</source>
@@ -680,24 +680,24 @@ Lütfen kimlik bilgilerini kaydetmek için doğru veritabanını seç.</translat
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation>Başlangıçta yerel mesajlaşma &amp;manifesto dosyalarını güncelle</translation>
+        <translation>Başlangıçta &amp;yerel mesajlaşma bildirim dosyalarını güncelle</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
-        <translation>KeePassXC ve tarayıcı uzantısı arasında bir proxy uygulamasını desteklesin.</translation>
+        <translation>KeePassXC ve tarayıcı eklentisi arasında vekil sunucu uygulaması desteklensin.</translation>
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
-        <translation>KeePassXC ve tarayıcı uzantısı arasında bir &amp;amp;proxy uygulaması kullan</translation>
+        <translation>KeePassXC ve tarayıcı eklentisi arasında bir &amp;vekil sunucu uygulaması kullan</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
-        <translation>Eğer el ile bir proxy yüklediyseniz, özel bir proxy konumu kullanın.</translation>
+        <translation>Elle vekil sunucu kurulduysa, özel vekil sunucu konumu kullan.</translation>
     </message>
     <message>
         <source>Use a &amp;custom proxy location</source>
         <comment>Meant is the proxy for KeePassXC-Browser</comment>
-        <translation>Ö&amp;zel bir proxy konumu kullan</translation>
+        <translation>&amp;Özel vekil sunucu konumu kullan</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -710,7 +710,7 @@ Lütfen kimlik bilgilerini kaydetmek için doğru veritabanını seç.</translat
     </message>
     <message>
         <source>Select custom proxy location</source>
-        <translation>Özel proxy konumunu seçin</translation>
+        <translation>Özel vekil sunucu konumunu seç</translation>
     </message>
     <message>
         <source>&amp;Tor Browser</source>
@@ -739,43 +739,43 @@ Lütfen kimlik bilgilerini kaydetmek için doğru veritabanını seç.</translat
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2. %3</source>
-        <translation>Tarayıcı bütünleşmesinin çalışması için KeePassXC-Tarayıcı gereklidir. &lt;br /&gt;%1 ve %2 için indirin. %3</translation>
+        <translation>Tarayıcı bütünleşmesinin çalışması için KeePassXC-Tarayıcı gereklidir. &lt;br /&gt; İndir %1 ve %2. %3</translation>
     </message>
     <message>
         <source>&amp;Brave</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Brave</translation>
     </message>
     <message>
         <source>Returns expired credentials. String [expired] is added to the title.</source>
-        <translation type="unfinished"/>
+        <translation>Süresi dolmuş kimlik bilgilerini döndürür. Dize [süresi doldu] başlığa eklendi.</translation>
     </message>
     <message>
         <source>&amp;Allow returning expired credentials.</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Süresi dolmuş kimlik bilgilerine izin ver.</translation>
     </message>
     <message>
         <source>Enable browser integration</source>
-        <translation type="unfinished"/>
+        <translation>Tarayıcı bütünleşmesini etkinleştir</translation>
     </message>
     <message>
         <source>Browsers installed as snaps are currently not supported.</source>
-        <translation type="unfinished"/>
+        <translation>Ek olarak yüklenen tarayıcılar şu anda desteklenmemektedir.</translation>
     </message>
     <message>
         <source>All databases connected to the extension will return matching credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Eklentiye bağlı tüm veritabanları eşleşen kimlik bilgilerini döndürür.</translation>
     </message>
     <message>
         <source>Don&apos;t display the popup suggesting migration of legacy KeePassHTTP settings.</source>
-        <translation type="unfinished"/>
+        <translation>Eski KeePassHTTP ayarlarının taşınmasını öneren açılır pencereyi görüntülemeyin.</translation>
     </message>
     <message>
         <source>&amp;Do not prompt for KeePassHTTP settings migration.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassHTTP ayarlarının taşınmasını &amp;istemeyin.</translation>
     </message>
     <message>
         <source>Custom proxy location field</source>
-        <translation type="unfinished"/>
+        <translation>Özel vekil sunucu konum alanı</translation>
     </message>
     <message>
         <source>Browser for custom proxy file</source>
@@ -808,7 +808,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Giriş Güncelleme</translation>
+        <translation>KeePassXC: Girdiyi Güncelle</translation>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
@@ -838,15 +838,15 @@ Moved %2 keys to custom data.</source>
     </message>
     <message>
         <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
-        <translation>KeePassXC: KeePassHTTP özelliklerine sahip bir giriş bulunamadı!</translation>
+        <translation>KeePassXC: KeePassHTTP özelliklerine sahip bir girdi bulunamadı!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
-        <translation>Aktif veritabanı KeePassHTTP özelliklerine sahip bir giriş içermiyor.</translation>
+        <translation>Aktif veritabanı KeePassHTTP özelliklerine sahip bir girdi içermiyor.</translation>
     </message>
     <message>
         <source>KeePassXC: Legacy browser integration settings detected</source>
-        <translation>KeePassXC: Eski tarayıcı tümleştirme ayarları algılandı</translation>
+        <translation>KeePassXC: Eski tarayıcı bütünleştirme ayarları tespit edildi</translation>
     </message>
     <message>
         <source>KeePassXC: Create a new group</source>
@@ -916,11 +916,11 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Encoding</source>
-        <translation>Kodlama</translation>
+        <translation>Kodlayıcı</translation>
     </message>
     <message>
         <source>Codec</source>
-        <translation>Kodlayıcı</translation>
+        <translation>Kod çözücü</translation>
     </message>
     <message>
         <source>Text is qualified by</source>
@@ -960,7 +960,7 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Original data: </source>
-        <translation>Orijinal veri:</translation>
+        <translation>Özgün veri:</translation>
     </message>
     <message>
         <source>Error</source>
@@ -968,7 +968,7 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Empty fieldname %1</source>
-        <translation>Boş alan adı %1</translation>
+        <translation>Alan adı boş %1</translation>
     </message>
     <message>
         <source>column %1</source>
@@ -976,7 +976,7 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Error(s) detected in CSV file!</source>
-        <translation>CSV dosyasında hata(lar) saptandı !</translation>
+        <translation>CSV dosyasında hatalar belirlendi!</translation>
     </message>
     <message numerus="yes">
         <source>[%n more message(s) skipped]</source>
@@ -998,11 +998,11 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Number of header lines to discard</source>
-        <translation type="unfinished"/>
+        <translation>Atılacak başlık satırı sayısı</translation>
     </message>
     <message>
         <source>CSV import preview</source>
-        <translation type="unfinished"/>
+        <translation>CSV içe aktarma önizlemesi</translation>
     </message>
 </context>
 <context>
@@ -1059,15 +1059,15 @@ Backup database located at %2</source>
     </message>
     <message>
         <source>Could not save, database does not point to a valid file.</source>
-        <translation type="unfinished"/>
+        <translation>Kaydedilemedi, veritabanı geçerli bir dosyayı göstermiyor.</translation>
     </message>
     <message>
         <source>Could not save, database file is read-only.</source>
-        <translation type="unfinished"/>
+        <translation>Kaydedilemedi, veritabanı dosyası salt okunur.</translation>
     </message>
     <message>
         <source>Database file has unmerged changes.</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı dosyasında birleştirilmemiş değişiklikler var.</translation>
     </message>
     <message>
         <source>Recycle Bin</source>
@@ -1123,39 +1123,39 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
     </message>
     <message>
         <source>Failed to open key file: %1</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar dosyası açılamadı: %1</translation>
     </message>
     <message>
         <source>Select slot...</source>
-        <translation type="unfinished"/>
+        <translation>Alan seç...</translation>
     </message>
     <message>
         <source>Unlock KeePassXC Database</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC Veritabanı Kilidini Aç</translation>
     </message>
     <message>
         <source>Enter Password:</source>
-        <translation type="unfinished"/>
+        <translation>Parolayı Gir:</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Parola alanı</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Parola görünürlüğünü değiştir</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar dosya seçimi</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Donanım anahtarı yuvası seçimi</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar dosyasına göz at</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1163,7 +1163,7 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Donanım belirteçlerini yenile</translation>
     </message>
     <message>
         <source>Hardware Key:</source>
@@ -1175,7 +1175,7 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
     </message>
     <message>
         <source>TouchID for Quick Unlock</source>
-        <translation type="unfinished"/>
+        <translation>Hızlı Kilit Açma için TouchID</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -1183,11 +1183,11 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
     </message>
     <message>
         <source>Clear Key File</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar Dosyasını Temizle</translation>
     </message>
     <message>
         <source>Unlock failed and no password given</source>
-        <translation type="unfinished"/>
+        <translation>Kilit açma başarısız oldu ve parola verilmedi</translation>
     </message>
     <message>
         <source>Unlocking the database failed and you did not enter a password.
@@ -1198,11 +1198,11 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
     </message>
     <message>
         <source>Retry with empty password</source>
-        <translation type="unfinished"/>
+        <translation>Boş parola ile tekrar deneyin</translation>
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
-        <translation type="unfinished"/>
+        <translation>Ek Kimlik Bilgileri Gir (varsa):</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
@@ -1315,7 +1315,7 @@ Bu işlem, tarayıcı eklentisine bağlantıyı engelleyebilir.</translation>
     </message>
     <message>
         <source>Enable Browser Integration to access these settings.</source>
-        <translation>Bu ayarlara erişmek için Tarayıcı Tümleşmesini etkinleştirin.</translation>
+        <translation>Bu ayarlara erişmek için Tarayıcı Bütünleşmesini etkinleştir.</translation>
     </message>
     <message>
         <source>Disconnect all browsers</source>
@@ -1367,7 +1367,7 @@ Girdilere erişim izinleri iptal edilecek.</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>%n girişindeki izinler başarıyla kaldırıldı.</numerusform><numerusform>%n girdiden izinler başarıyla kaldırıldı.</numerusform></translation>
+        <translation><numerusform>%n girdideki izinler başarıyla kaldırıldı.</numerusform><numerusform>%n girdideki izinler başarıyla kaldırıldı.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
@@ -1586,7 +1586,7 @@ Eğer bu sayı ile devam ederseniz, veritabanınız çok kolay çözülerek kır
     </message>
     <message>
         <source>Enable fd.o Secret Service to access these settings.</source>
-        <translation type="unfinished"/>
+        <translation>Bu ayarlara erişmek için fd.o Gizli Servisi etkinleştir.</translation>
     </message>
 </context>
 <context>
@@ -1649,7 +1649,7 @@ Eğer bu sayı ile devam ederseniz, veritabanınız çok kolay çözülerek kır
     </message>
     <message>
         <source>Maximum number of history items per entry</source>
-        <translation type="unfinished"/>
+        <translation>Girdi başına azami geçmiş ögesi sayısı</translation>
     </message>
     <message>
         <source>Maximum size of history per entry</source>
@@ -1779,23 +1779,23 @@ Parola olmadan devam etmek istediğinize emin misiniz?</translation>
     </message>
     <message>
         <source>Database name</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı adı</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Açıklama</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation type="unfinished"/>
+        <translation>Konum</translation>
     </message>
     <message>
         <source>Last saved</source>
-        <translation type="unfinished"/>
+        <translation>Son kaydedilen</translation>
     </message>
     <message>
         <source>Unsaved changes</source>
-        <translation type="unfinished"/>
+        <translation>Kaydedilmemiş değişiklikler</translation>
     </message>
     <message>
         <source>yes</source>
@@ -1863,11 +1863,11 @@ Parola olmadan devam etmek istediğinize emin misiniz?</translation>
     </message>
     <message>
         <source>Average password length</source>
-        <translation type="unfinished"/>
+        <translation>Ortalama parola uzunluğu</translation>
     </message>
     <message>
         <source>%1 characters</source>
-        <translation type="unfinished"/>
+        <translation>%1 karakter</translation>
     </message>
     <message>
         <source>Average password length is less than ten characters. Longer passwords provide more security.</source>
@@ -1955,11 +1955,11 @@ Bu kesinlikle bir hatadır, lütfen geliştiricilere bildirin.</translation>
     </message>
     <message>
         <source>Export database to HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanını HTML dosyasına aktar</translation>
     </message>
     <message>
         <source>HTML file</source>
-        <translation type="unfinished"/>
+        <translation>HTML dosyası</translation>
     </message>
     <message>
         <source>Writing the HTML file failed.</source>
@@ -2116,7 +2116,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Replace references to entry?</source>
-        <translation>Giriş referansları değiştirilsin mi?</translation>
+        <translation>Girdi referansları değiştirilsin mi?</translation>
     </message>
     <message numerus="yes">
         <source>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</source>
@@ -2152,14 +2152,14 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>This database is opened in read-only mode. Autosave is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Bu veritabanı salt okunur kipte açılır. Otomatik kaydetme devre dışı.</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
-        <translation>Giriş</translation>
+        <translation>Girdi</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -2171,7 +2171,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Oto-Yazım</translation>
+        <translation>Otomatik Yazım</translation>
     </message>
     <message>
         <source>Properties</source>
@@ -2207,15 +2207,15 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Entry history</source>
-        <translation>Giriş geçmişi</translation>
+        <translation>Girdi geçmişi</translation>
     </message>
     <message>
         <source>Add entry</source>
-        <translation>Giriş ekle</translation>
+        <translation>Girdi ekle</translation>
     </message>
     <message>
         <source>Edit entry</source>
-        <translation>Girişi düzenle</translation>
+        <translation>Girdiyi düzenle</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
@@ -2247,7 +2247,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation>Oluşturulan parolayı bu girişe uygulamak istiyor musunuz?</translation>
+        <translation>Oluşturulan parolayı bu girdiye uygulamak istiyor musunuz?</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
@@ -2255,7 +2255,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Entry has unsaved changes</source>
-        <translation>Giriş kaydedilmemiş değişikliklere sahip</translation>
+        <translation>Girdi kaydedilmemiş değişikliklere sahip</translation>
     </message>
     <message>
         <source>New attribute %1</source>
@@ -2279,7 +2279,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>&lt;empty URL&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;empty URL&gt;</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this URL?</source>
@@ -2314,7 +2314,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Dosya ekleri</translation>
+        <translation>Ekler</translation>
     </message>
     <message>
         <source>Foreground Color:</source>
@@ -2326,19 +2326,19 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Attribute selection</source>
-        <translation type="unfinished"/>
+        <translation>Öznitelik seçimi</translation>
     </message>
     <message>
         <source>Attribute value</source>
-        <translation type="unfinished"/>
+        <translation>Öznitelik değeri</translation>
     </message>
     <message>
         <source>Add a new attribute</source>
-        <translation type="unfinished"/>
+        <translation>Yeni öznitelik ekle</translation>
     </message>
     <message>
         <source>Remove selected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Seçili özniteliği kaldır</translation>
     </message>
     <message>
         <source>Edit attribute name</source>
@@ -2354,26 +2354,26 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Foreground color selection</source>
-        <translation type="unfinished"/>
+        <translation>Ön plan renk seçimi</translation>
     </message>
     <message>
         <source>Background color selection</source>
-        <translation type="unfinished"/>
+        <translation>Arka plan rengi seçimi</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation>Bu giriş için Oto-Yazımı etkinleştir</translation>
+        <translation>Bu girdi için Otomatik Yazımı etkinleştir</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>&amp;Kümeden öntanımlı Oto-Yazım sırasını devral</translation>
+        <translation>&amp;Kümeden öntanımlı Otomatik Yazım sırasını devral</translation>
     </message>
     <message>
         <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Özel Oto-Yazım sırası k&amp;ullan:</translation>
+        <translation>Özel Otomatik Yazım sırası &amp;kullan:</translation>
     </message>
     <message>
         <source>Window Associations</source>
@@ -2393,31 +2393,31 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Use a specific sequence for this association:</source>
-        <translation>Bu ilişki için belirli bir sıra kullan:</translation>
+        <translation>Bu ilişkilendirme için belirli bir sıra kullan:</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Özel Otomatik Yazım sırası</translation>
     </message>
     <message>
         <source>Open Auto-Type help webpage</source>
-        <translation type="unfinished"/>
+        <translation>Otomatik Yazım yardım sayfasını aç</translation>
     </message>
     <message>
         <source>Existing window associations</source>
-        <translation type="unfinished"/>
+        <translation>Mevcut pencere ilişkilendirmeleri</translation>
     </message>
     <message>
         <source>Add new window association</source>
-        <translation type="unfinished"/>
+        <translation>Yeni pencere ilişkilendirmesi ekle</translation>
     </message>
     <message>
         <source>Remove selected window association</source>
-        <translation type="unfinished"/>
+        <translation>Seçili pencere ilişkilendirmesini kaldır</translation>
     </message>
     <message>
         <source>You can use an asterisk (*) to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Her şeyi eşleştirmek için yıldız işareti (*) kullanabilirsiniz</translation>
     </message>
     <message>
         <source>Set the window association title</source>
@@ -2436,7 +2436,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     <name>EditEntryWidgetBrowser</name>
     <message>
         <source>These settings affect to the entry&apos;s behaviour with the browser extension.</source>
-        <translation type="unfinished"/>
+        <translation>Bu ayarlar, girdinin tarayıcı eklentisiyle davranışını etkiler.</translation>
     </message>
     <message>
         <source>General</source>
@@ -2464,7 +2464,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"/>
+        <translation>Düzenle</translation>
     </message>
 </context>
 <context>
@@ -2487,7 +2487,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Entry history selection</source>
-        <translation type="unfinished"/>
+        <translation>Girdi geçmişi seçimi</translation>
     </message>
     <message>
         <source>Show entry at selected history state</source>
@@ -2499,11 +2499,11 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Delete selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Seçili geçmiş durumunu sil</translation>
     </message>
     <message>
         <source>Delete all history</source>
-        <translation type="unfinished"/>
+        <translation>Tüm geçmişi sil</translation>
     </message>
 </context>
 <context>
@@ -2518,7 +2518,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Repeat:</source>
-        <translation>Yinele:</translation>
+        <translation>Tekrarla:</translation>
     </message>
     <message>
         <source>Title:</source>
@@ -2542,31 +2542,31 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Expires</source>
-        <translation>Geçersiz</translation>
+        <translation>Süre bitimi</translation>
     </message>
     <message>
         <source>Url field</source>
-        <translation type="unfinished"/>
+        <translation>URL alanı</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>URL üstünden simge indir</translation>
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Parola tekrarlama alanı</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Parola oluşturucu göster ve gizle</translation>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Parola alanı</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Parola görünürlüğünü değiştir</translation>
     </message>
     <message>
         <source>Toggle notes visible</source>
@@ -2574,7 +2574,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Son kullanma alanı</translation>
     </message>
     <message>
         <source>Expiration Presets</source>
@@ -2586,7 +2586,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Notlar alanı</translation>
     </message>
     <message>
         <source>Title field</source>
@@ -2686,7 +2686,7 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>External key file</source>
-        <translation type="unfinished"/>
+        <translation>Harici anahtar dosyası</translation>
     </message>
     <message>
         <source>Select attachment file</source>
@@ -2760,11 +2760,11 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>KeeShare unsigned container</source>
-        <translation>KeeShare imzalanmamış kapsayıcı</translation>
+        <translation>KeeShare imzalanmamış konteyner</translation>
     </message>
     <message>
         <source>KeeShare signed container</source>
-        <translation>KeeShare imzalanmış kapsayıcı</translation>
+        <translation>KeeShare imzalanmış konteyner</translation>
     </message>
     <message>
         <source>Select import source</source>
@@ -2792,12 +2792,13 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"/>
+        <translation>Eşitle</translation>
     </message>
     <message>
         <source>Your KeePassXC version does not support sharing this container type.
 Supported extensions are: %1.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC sürümü bu konteyner türünün paylaşılmasını desteklemiyor.
+Desteklenen eklentiler: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
@@ -2814,15 +2815,15 @@ Supported extensions are: %1.</source>
     <message>
         <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
         <comment>KeeShare is a proper noun</comment>
-        <translation type="unfinished"/>
+        <translation>KeeShare şu anda devre dışı, içe/dışa aktarmayı uygulama ayarlarından etkinleştirebilirsiniz.</translation>
     </message>
     <message>
         <source>Database export is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı dışa aktarma uygulama ayarları tarafından devre dışı bırakıldı.</translation>
     </message>
     <message>
         <source>Database import is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı içe aktarma uygulama ayarları tarafından devre dışı bırakıldı.</translation>
     </message>
     <message>
         <source>Sharing mode field</source>
@@ -2838,19 +2839,19 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Parola alanı</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Parola görünürlüğünü değiştir</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Parola oluşturucu göster ve gizle</translation>
     </message>
     <message>
         <source>Clear fields</source>
-        <translation type="unfinished"/>
+        <translation>Alanları temizle</translation>
     </message>
 </context>
 <context>
@@ -2865,7 +2866,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Geçersiz</translation>
+        <translation>Süre bitimi</translation>
     </message>
     <message>
         <source>Search</source>
@@ -2873,23 +2874,23 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Oto-Yazım</translation>
+        <translation>Otomatik Yazım</translation>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation>Üst kümenin öntanımlı Oto-Yazım dizilişini k&amp;ullan</translation>
+        <translation>Üst kümenin öntanımlı Otomatik Yazım dizilişini &amp;kullan</translation>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
-        <translation>Öntanımlı Oto-Yazım &amp;dizilişi belirle</translation>
+        <translation>Öntanımlı Otomatik Yazım &amp;dizilişi belirle</translation>
     </message>
     <message>
         <source>Name field</source>
-        <translation type="unfinished"/>
+        <translation>İsim alanı</translation>
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Notlar alanı</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
@@ -2897,11 +2898,11 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Auto-Type toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Bu ve alt gruplar için Otomatik Yazım geçişi</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Son kullanma alanı</translation>
     </message>
     <message>
         <source>Search toggle for this and sub groups</source>
@@ -2976,15 +2977,15 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
-        <translation type="unfinished"/>
+        <translation>DuckDuckGo web sitesi simge hizmetini Araçlar -&gt; Ayarlar -&gt; Güvenlik altından etkinleştirebilirsiniz</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>URL üstünden simge indir</translation>
     </message>
     <message>
         <source>Apply selected icon to subgroups and entries</source>
-        <translation type="unfinished"/>
+        <translation>Seçili simgeyi alt gruplara ve girdilere uygula</translation>
     </message>
     <message>
         <source>Apply icon &amp;to ...</source>
@@ -2992,7 +2993,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Apply to this only</source>
-        <translation type="unfinished"/>
+        <translation>Sadece buna uygula</translation>
     </message>
     <message>
         <source>Also apply to child groups</source>
@@ -3073,11 +3074,11 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
     <message>
         <source>Plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Eklenti verisi</translation>
     </message>
     <message>
         <source>Remove selected plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Seçili eklenti verilerini kaldır</translation>
     </message>
 </context>
 <context>
@@ -3177,23 +3178,23 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Dosya ekleri</translation>
+        <translation>Ekler</translation>
     </message>
     <message>
         <source>Add new attachment</source>
-        <translation type="unfinished"/>
+        <translation>Yeni ek ekle</translation>
     </message>
     <message>
         <source>Remove selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Seçili eki kaldır</translation>
     </message>
     <message>
         <source>Open selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Seçili eki aç</translation>
     </message>
     <message>
         <source>Save selected attachment to disk</source>
-        <translation type="unfinished"/>
+        <translation>Seçili eki diske kaydet</translation>
     </message>
 </context>
 <context>
@@ -3259,7 +3260,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Geçersiz</translation>
+        <translation>Süre bitimi</translation>
     </message>
     <message>
         <source>Created</source>
@@ -3275,7 +3276,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Dosya ekleri</translation>
+        <translation>Ekler</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -3306,7 +3307,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
     <message>
         <source>Expiration</source>
-        <translation>Geçerlilik</translation>
+        <translation>Süre bitimi</translation>
     </message>
     <message>
         <source>URL</source>
@@ -3318,7 +3319,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Dosya ekleri</translation>
+        <translation>Ekler</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3326,7 +3327,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
     <message>
         <source>Autotype</source>
-        <translation>Oto-yazım</translation>
+        <translation>Otomatik yazım</translation>
     </message>
     <message>
         <source>Window</source>
@@ -3424,7 +3425,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     <name>FdoSecrets::Service</name>
     <message>
         <source>Failed to register DBus service at %1: another secret service is running.</source>
-        <translation type="unfinished"/>
+        <translation>%1&apos;de DBus hizmeti kaydedilemedi: başka bir gizli servis çalışıyor.</translation>
     </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
@@ -3436,7 +3437,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     <name>FdoSecretsPlugin</name>
     <message>
         <source>Fdo Secret Service: %1</source>
-        <translation type="unfinished"/>
+        <translation>Fdo Gizli Servis: %1</translation>
     </message>
 </context>
 <context>
@@ -3462,7 +3463,7 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation type="unfinished"/>
+        <translation>Simge İndir</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -3471,7 +3472,8 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     <message>
         <source>Having trouble downloading icons?
 You can enable the DuckDuckGo website icon service in the security section of the application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Simgeleri indirmede sorun mu yaşıyorsunuz?
+DuckDuckGo web sitesi simge servisini uygulama ayarlarının güvenlik bölümünden etkinleştirin.</translation>
     </message>
     <message>
         <source>Close</source>
@@ -3487,11 +3489,11 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Please wait, processing entry list...</source>
-        <translation type="unfinished"/>
+        <translation>Lütfen bekleyin, girdi listesi işleniyor...</translation>
     </message>
     <message>
         <source>Downloading...</source>
-        <translation type="unfinished"/>
+        <translation>İndiriliyor...</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -3499,15 +3501,15 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Already Exists</source>
-        <translation type="unfinished"/>
+        <translation>Zaten Var</translation>
     </message>
     <message>
         <source>Download Failed</source>
-        <translation type="unfinished"/>
+        <translation>İndirme Başarısız</translation>
     </message>
     <message>
         <source>Downloading favicons (%1/%2)...</source>
-        <translation type="unfinished"/>
+        <translation>Simgeler indiriliyor (%1/%2)...</translation>
     </message>
 </context>
 <context>
@@ -3529,7 +3531,7 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Unable to issue challenge-response.</source>
-        <translation>challenge-response açılamıyor.</translation>
+        <translation>Karşılama yanıtı açılamıyor.</translation>
     </message>
     <message>
         <source>missing database headers</source>
@@ -3818,7 +3820,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veritabanını eski Kee
     </message>
     <message>
         <source>Invalid EnableAutoType value</source>
-        <translation>Geçersiz Oto-Yazım Etkinleştirme değeri</translation>
+        <translation>Geçersiz Otomatik Yazım Etkinleştirme değeri</translation>
     </message>
     <message>
         <source>Invalid EnableSearching value</source>
@@ -3862,7 +3864,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veritabanını eski Kee
     </message>
     <message>
         <source>Entry string key or value missing</source>
-        <translation>Giriş dizesi anahtarı veya değeri eksik</translation>
+        <translation>Girdi dizesi anahtarı veya değeri eksik</translation>
     </message>
     <message>
         <source>Duplicate attachment found</source>
@@ -3874,7 +3876,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veritabanını eski Kee
     </message>
     <message>
         <source>Auto-type association window or sequence missing</source>
-        <translation>Oto-Yazım ilişkilendirme penceresi veya sırası eksik</translation>
+        <translation>Otomatik Yazım ilişkilendirme penceresi veya sırası eksik</translation>
     </message>
     <message>
         <source>Invalid bool value</source>
@@ -4042,15 +4044,15 @@ Satır %2, sütun %3</translation>
     </message>
     <message>
         <source>Read entry field data doesn&apos;t match size</source>
-        <translation>Giriş alan verisi okuma boyutuyla eşleşmiyor</translation>
+        <translation>Girdi alan verisi okuma boyutuyla eşleşmiyor</translation>
     </message>
     <message>
         <source>Invalid entry uuid field size</source>
-        <translation>Geçersiz giriş UUID alan boyutu</translation>
+        <translation>Geçersiz girdi UUID alan boyutu</translation>
     </message>
     <message>
         <source>Invalid entry group id field size</source>
-        <translation>Geçersiz küme kimliği alan boyutu girişi</translation>
+        <translation>Geçersiz girdi kümesi kimliği alan boyutu</translation>
     </message>
     <message>
         <source>Invalid entry icon field size</source>
@@ -4090,7 +4092,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Inactive share %1</source>
-        <translation type="unfinished"/>
+        <translation>Etkin olmayan paylaşım %1</translation>
     </message>
     <message>
         <source>Imported from %1</source>
@@ -4114,7 +4116,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Inactive share</source>
-        <translation type="unfinished"/>
+        <translation>Etkin olmayan paylaşım</translation>
     </message>
     <message>
         <source>Imported from</source>
@@ -4208,7 +4210,7 @@ Message: %2</source>
     </message>
     <message>
         <source>All files</source>
-        <translation>Bütün dosyalar</translation>
+        <translation>Tüm dosyalar</translation>
     </message>
     <message>
         <source>Create Key File...</source>
@@ -4228,11 +4230,11 @@ Message: %2</source>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar dosya seçimi</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar dosyasına göz at</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -4240,7 +4242,7 @@ Message: %2</source>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation type="unfinished"/>
+        <translation>Yeni anahtar dosyası oluştur</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
@@ -4248,7 +4250,7 @@ Message: %2</source>
     </message>
     <message>
         <source>Invalid Key File</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz Anahtar Dosyası</translation>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
@@ -4280,7 +4282,7 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>E&amp;ntries</source>
-        <translation>G&amp;irdiler</translation>
+        <translation>&amp;Girdiler</translation>
     </message>
     <message>
         <source>&amp;Groups</source>
@@ -4300,11 +4302,11 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>&amp;Open database...</source>
-        <translation>Veri&amp;tabanı aç...</translation>
+        <translation>Veritabanı &amp;aç...</translation>
     </message>
     <message>
         <source>&amp;Save database</source>
-        <translation>Veritabanını k&amp;aydet</translation>
+        <translation>Veritabanını &amp;kaydet</translation>
     </message>
     <message>
         <source>&amp;Close database</source>
@@ -4352,7 +4354,7 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation>Veritabanlarını kilit&amp;le</translation>
+        <translation>Veritabanlarını &amp;kilitle</translation>
     </message>
     <message>
         <source>&amp;Title</source>
@@ -4428,11 +4430,11 @@ Bu sürüm, üretim kullanımı için uygun değildir.</translation>
     </message>
     <message>
         <source>&amp;Donate</source>
-        <translation>Bağış</translation>
+        <translation>&amp;Bağış</translation>
     </message>
     <message>
         <source>Report a &amp;bug</source>
-        <translation>Hata raporla</translation>
+        <translation>Bir &amp;hata raporla</translation>
     </message>
     <message>
         <source>WARNING: Your Qt version may cause KeePassXC to crash with an On-Screen Keyboard!
@@ -4462,7 +4464,7 @@ Keepassxc indirme sayfasında mevcut Appımage kullanmanızı öneririz.</transl
     </message>
     <message>
         <source>&amp;Merge from database...</source>
-        <translation>Veritabanından &amp;birleştir ...</translation>
+        <translation>Veritabanı üstünden &amp;birleştir...</translation>
     </message>
     <message>
         <source>Merge from another KDBX database</source>
@@ -4506,7 +4508,7 @@ Keepassxc indirme sayfasında mevcut Appımage kullanmanızı öneririz.</transl
     </message>
     <message>
         <source>Perform &amp;Auto-Type</source>
-        <translation>&amp;Oto-Yazım gerçekleştir</translation>
+        <translation>&amp;Otomatik Yazım gerçekleştir</translation>
     </message>
     <message>
         <source>Open &amp;URL</source>
@@ -4556,27 +4558,27 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"/>
+        <translation>Dışa &amp;aktar</translation>
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Güncellemeleri kontrol et...</translation>
     </message>
     <message>
         <source>Downlo&amp;ad all favicons</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tüm simgeleri indir</translation>
     </message>
     <message>
         <source>Sort &amp;A-Z</source>
-        <translation type="unfinished"/>
+        <translation>Sırala &amp;A-Z</translation>
     </message>
     <message>
         <source>Sort &amp;Z-A</source>
-        <translation type="unfinished"/>
+        <translation>Sırala &amp;Z-A</translation>
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Parola Oluşturucu</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4584,7 +4586,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>&amp;Export to HTML file...</source>
-        <translation type="unfinished"/>
+        <translation>HTML dosyasına &amp;aktar...</translation>
     </message>
     <message>
         <source>1Password Vault...</source>
@@ -4596,7 +4598,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>&amp;Getting Started</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Başlangıç</translation>
     </message>
     <message>
         <source>Open Getting Started Guide PDF</source>
@@ -4604,7 +4606,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>&amp;Online Help...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Çevrimiçi Yardım...</translation>
     </message>
     <message>
         <source>Go to online documentation (opens browser)</source>
@@ -4612,7 +4614,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>&amp;User Guide</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Kullanıcı Rehberi</translation>
     </message>
     <message>
         <source>Open User Guide PDF</source>
@@ -4620,7 +4622,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>&amp;Keyboard Shortcuts</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Klavye Kısayolları</translation>
     </message>
 </context>
 <context>
@@ -4927,11 +4929,11 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     <name>PasswordEdit</name>
     <message>
         <source>Passwords do not match</source>
-        <translation type="unfinished"/>
+        <translation>Parolalar eşleşmiyor</translation>
     </message>
     <message>
         <source>Passwords match so far</source>
-        <translation type="unfinished"/>
+        <translation>Parolalar şu ana kadar eşleşiyor</translation>
     </message>
 </context>
 <context>
@@ -4962,19 +4964,19 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>Password field</source>
-        <translation type="unfinished"/>
+        <translation>Parola alanı</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Parola görünürlüğünü değiştir</translation>
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Parola tekrarlama alanı</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Parola oluşturucu göster ve gizle</translation>
     </message>
 </context>
 <context>
@@ -5006,7 +5008,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>Numbers</source>
-        <translation>Rakamlar</translation>
+        <translation>Sayılar</translation>
     </message>
     <message>
         <source>Extended ASCII</source>
@@ -5054,7 +5056,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>Password Quality: %1</source>
-        <translation>Parola Niteliği: %1</translation>
+        <translation>Parola Kalitesi: %1</translation>
     </message>
     <message>
         <source>Poor</source>
@@ -5178,71 +5180,71 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>Generated password</source>
-        <translation type="unfinished"/>
+        <translation>Oluşturulan parola</translation>
     </message>
     <message>
         <source>Upper-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Büyük harfler</translation>
     </message>
     <message>
         <source>Lower-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Küçük harfler</translation>
     </message>
     <message>
         <source>Special characters</source>
-        <translation type="unfinished"/>
+        <translation>Özel karakterler</translation>
     </message>
     <message>
         <source>Math Symbols</source>
-        <translation type="unfinished"/>
+        <translation>Matematiksel Semboller</translation>
     </message>
     <message>
         <source>Dashes and Slashes</source>
-        <translation type="unfinished"/>
+        <translation>Tire ve Eğik çizgiler</translation>
     </message>
     <message>
         <source>Excluded characters</source>
-        <translation type="unfinished"/>
+        <translation>Hariç tutulan karakterler</translation>
     </message>
     <message>
         <source>Hex Passwords</source>
-        <translation type="unfinished"/>
+        <translation>Onaltılı Parolalar</translation>
     </message>
     <message>
         <source>Password length</source>
-        <translation type="unfinished"/>
+        <translation>Parola uzunluğu</translation>
     </message>
     <message>
         <source>Word Case:</source>
-        <translation type="unfinished"/>
+        <translation>Kelime Örneği:</translation>
     </message>
     <message>
         <source>Regenerate password</source>
-        <translation type="unfinished"/>
+        <translation>Yeniden parola oluştur</translation>
     </message>
     <message>
         <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>Parolayı kopyala</translation>
     </message>
     <message>
         <source>Accept password</source>
-        <translation type="unfinished"/>
+        <translation>Parolayı kabul et</translation>
     </message>
     <message>
         <source>lower case</source>
-        <translation type="unfinished"/>
+        <translation>küçük harf</translation>
     </message>
     <message>
         <source>UPPER CASE</source>
-        <translation type="unfinished"/>
+        <translation>Büyük Harf</translation>
     </message>
     <message>
         <source>Title Case</source>
-        <translation type="unfinished"/>
+        <translation>Başlık Örneği</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
-        <translation type="unfinished"/>
+        <translation>Parola görünürlüğünü değiştir</translation>
     </message>
 </context>
 <context>
@@ -5292,7 +5294,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"/>
+        <translation>Devam</translation>
     </message>
 </context>
 <context>
@@ -5303,7 +5305,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>Database hash not available</source>
-        <translation>Veritabanı karma erişilemez</translation>
+        <translation>Veritabanı sağlaması mevcut değil</translation>
     </message>
     <message>
         <source>Client public key not received</source>
@@ -5408,7 +5410,7 @@ Bazı hatalar ve küçük sorunlar olabilir, bu sürüm şu an dağıtımda değ
     </message>
     <message>
         <source>Edit an entry.</source>
-        <translation>Girdi düzenle.</translation>
+        <translation>Bir girdi düzenle.</translation>
     </message>
     <message>
         <source>Title for the entry.</source>
@@ -5508,15 +5510,15 @@ Kullanılabilir komutlar:
     </message>
     <message>
         <source>NULL device</source>
-        <translation>Geçersiz aygıt</translation>
+        <translation>Geçersiz cihaz</translation>
     </message>
     <message>
         <source>error reading from device</source>
-        <translation>aygıttan okuma hatası</translation>
+        <translation>cihazdan okuma hatası</translation>
     </message>
     <message>
         <source>malformed string</source>
-        <translation>hatalı biçimlendirilmiş dizi</translation>
+        <translation>kusurlu dizge</translation>
     </message>
     <message>
         <source>missing closing quote</source>
@@ -5544,7 +5546,7 @@ Kullanılabilir komutlar:
     </message>
     <message>
         <source>Last Modified</source>
-        <translation>Son değişiklik</translation>
+        <translation>Son Değişiklik</translation>
     </message>
     <message>
         <source>Created</source>
@@ -5594,7 +5596,7 @@ Kullanılabilir komutlar:
     </message>
     <message>
         <source>Writing the database failed %1.</source>
-        <translation>Veritabanı yazma %1 başarısız oldu.</translation>
+        <translation>Veritabanına yazma başarısız: %1</translation>
     </message>
     <message>
         <source>Successfully added entry %1.</source>
@@ -5829,11 +5831,11 @@ Kullanılabilir komutlar:
     </message>
     <message>
         <source>Successfully deleted entry %1.</source>
-        <translation>%1 girişi başarıyla silindi.</translation>
+        <translation>%1 girdisi başarıyla silindi.</translation>
     </message>
     <message>
         <source>Show the entry&apos;s current TOTP.</source>
-        <translation>Girişin mevcut TOTP&apos;sini göster.</translation>
+        <translation>Girdilerin mevcut TOTP&apos;sini göster.</translation>
     </message>
     <message>
         <source>ERROR: unknown attribute %1.</source>
@@ -5987,7 +5989,7 @@ Kullanılabilir komutlar:
     </message>
     <message>
         <source>Deactivate password key for the database.</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı için parola anahtarını devre dışı bırak.</translation>
     </message>
     <message>
         <source>Displays debugging information.</source>
@@ -6015,7 +6017,7 @@ Kullanılabilir komutlar:
     </message>
     <message>
         <source>Debugging mode is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Hata ayıklama kipi devre dışı.</translation>
     </message>
     <message>
         <source>Debugging mode is enabled.</source>
@@ -6031,7 +6033,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Oto-Yazım</translation>
+        <translation>Otomatik Yazım</translation>
     </message>
     <message>
         <source>KeeShare (signed and unsigned sharing)</source>
@@ -6071,7 +6073,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Adds a new group to a database.</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanına yeni bir küme ekler.</translation>
     </message>
     <message>
         <source>Path of the group to add.</source>
@@ -6095,7 +6097,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>FILENAME</source>
-        <translation type="unfinished"/>
+        <translation>DOSYAADI</translation>
     </message>
     <message>
         <source>Analyze passwords for weaknesses and problems.</source>
@@ -6143,15 +6145,15 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Exports the content of a database to standard output in the specified format.</source>
-        <translation type="unfinished"/>
+        <translation>Bir veritabanının içeriğini belirtilen biçimde standart çıktıya aktarır.</translation>
     </message>
     <message>
         <source>Unable to export database to XML: %1</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı XML&apos;ye dışa aktarılamıyor: %1</translation>
     </message>
     <message>
         <source>Unsupported format %1</source>
-        <translation type="unfinished"/>
+        <translation>Desteklenmeyen biçim %1</translation>
     </message>
     <message>
         <source>Use numbers</source>
@@ -6167,7 +6169,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Available commands:</source>
-        <translation type="unfinished"/>
+        <translation>Kullanılabilir komutlar:</translation>
     </message>
     <message>
         <source>Import the contents of an XML database.</source>
@@ -6179,7 +6181,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Path of the new database.</source>
-        <translation type="unfinished"/>
+        <translation>Yeni veritabanının yolu.</translation>
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
@@ -6191,7 +6193,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Unknown command %1</source>
-        <translation type="unfinished"/>
+        <translation>Bilinmeyen komut %1</translation>
     </message>
     <message>
         <source>Flattens the output to single lines.</source>
@@ -6199,7 +6201,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Only print the changes detected by the merge operation.</source>
-        <translation type="unfinished"/>
+        <translation>Yalnızca birleştirme işlemi tarafından algılanan değişiklikleri yazdır.</translation>
     </message>
     <message>
         <source>Yubikey slot for the second database.</source>
@@ -6239,7 +6241,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Open a database.</source>
-        <translation type="unfinished"/>
+        <translation>Bir veritabanı aç.</translation>
     </message>
     <message>
         <source>Path of the group to remove.</source>
@@ -6259,7 +6261,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Failed to open database file %1: not found</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı dosyası açılamadı %1: bulunamadı</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not a plain file</source>
@@ -6291,11 +6293,11 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Secret Service Integration</source>
-        <translation type="unfinished"/>
+        <translation>Gizli Servis Bütünleşmesi</translation>
     </message>
     <message>
         <source>User name</source>
-        <translation type="unfinished"/>
+        <translation>Kullanıcı adı</translation>
     </message>
     <message>
         <source>%1[%2] Challenge Response - Slot %3 - %4</source>
@@ -6470,11 +6472,11 @@ MİB mimarisi: %2
     <name>SettingsWidgetFdoSecrets</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"/>
+        <translation>Seçenekler</translation>
     </message>
     <message>
         <source>Enable KeepassXC Freedesktop.org Secret Service integration</source>
-        <translation type="unfinished"/>
+        <translation>KeepassXC Freedesktop.org Gizli Servis bütünleşmesini etkinleştir</translation>
     </message>
     <message>
         <source>General</source>
@@ -6482,7 +6484,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Show notification when credentials are requested</source>
-        <translation type="unfinished"/>
+        <translation>Kimlik bilgileri istendiğinde bir bildirim göster</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -6490,7 +6492,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation type="unfinished"/>
+        <translation>Girdiler istemciler tarafından silindiğinde onaylamayın.</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
@@ -6498,7 +6500,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>File Name</source>
-        <translation type="unfinished"/>
+        <translation>Dosya Adı</translation>
     </message>
     <message>
         <source>Group</source>
@@ -6506,19 +6508,19 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Manage</source>
-        <translation type="unfinished"/>
+        <translation>Yönetim</translation>
     </message>
     <message>
         <source>Authorization</source>
-        <translation type="unfinished"/>
+        <translation>Yetki</translation>
     </message>
     <message>
         <source>These applications are currently connected:</source>
-        <translation type="unfinished"/>
+        <translation>Bu uygulamalar şu anda bağlı:</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished"/>
+        <translation>Uygulama</translation>
     </message>
     <message>
         <source>Disconnect</source>
@@ -6569,7 +6571,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Own certificate</source>
-        <translation>Kendi sertifikası</translation>
+        <translation>Öz sertifika</translation>
     </message>
     <message>
         <source>Fingerprint:</source>
@@ -6658,7 +6660,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>All files</source>
-        <translation>Bütün dosyalar</translation>
+        <translation>Tüm dosyalar</translation>
     </message>
     <message>
         <source>Select path</source>
@@ -6678,15 +6680,15 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Allow KeeShare imports</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare içe aktarımlara izin ver</translation>
     </message>
     <message>
         <source>Allow KeeShare exports</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare dışa aktarımlara izin ver</translation>
     </message>
     <message>
         <source>Only show warnings and errors</source>
-        <translation type="unfinished"/>
+        <translation>Yalnızca uyarıları ve hataları göster</translation>
     </message>
     <message>
         <source>Key</source>
@@ -6694,7 +6696,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Signer name field</source>
-        <translation type="unfinished"/>
+        <translation>İmzalayan adı alanı</translation>
     </message>
     <message>
         <source>Generate new certificate</source>
@@ -6726,18 +6728,18 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Remove selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Seçilen sertifikayı kaldır</translation>
     </message>
 </context>
 <context>
     <name>ShareExport</name>
     <message>
         <source>Overwriting signed share container is not supported - export prevented</source>
-        <translation>İmzalanmış paylaşım kapsayıcısının üzerine yazma desteklenmiyor -dışa aktarma engellendi</translation>
+        <translation>İmzalı paylaşım konteynerin üzerine yazma desteklenmiyor -dışa aktarma engellendi</translation>
     </message>
     <message>
         <source>Could not write export container (%1)</source>
-        <translation>Dışa aktarma kapsayıcısı (%1) yazılamadı</translation>
+        <translation>Dışa aktarım konteynere yazılamadı (%1)</translation>
     </message>
     <message>
         <source>Could not embed signature: Could not open file to write (%1)</source>
@@ -6757,11 +6759,11 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Overwriting unsigned share container is not supported - export prevented</source>
-        <translation>İmzalanmamış paylaşım kapsayıcısının üzerine yazma desteklenmiyor -dışa aktarma engellendi</translation>
+        <translation>İmzasız paylaşım konteynerin üzerine yazma desteklenmiyor -dışa aktarma engellendi</translation>
     </message>
     <message>
         <source>Could not write export container</source>
-        <translation>Dışa aktarma kapsayıcısı yazılamadı</translation>
+        <translation>Dışa aktarım konteynere yazılamadı</translation>
     </message>
     <message>
         <source>Unexpected export error occurred</source>
@@ -6772,15 +6774,15 @@ MİB mimarisi: %2
     <name>ShareImport</name>
     <message>
         <source>Import from container without signature</source>
-        <translation>İmzayı kapsayıcıdan içeri aktar</translation>
+        <translation>İmzayı konteynerden içeri aktar</translation>
     </message>
     <message>
         <source>We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?</source>
-        <translation>İmzalı olmadığından paylaşılan kapsayıcının kaynağını doğrulayamazsınız. %1 ögesinden gerçekten almak istiyor musunuz?</translation>
+        <translation>İmzalı olmadığından paylaşılan konteynerin kaynağını doğrulayamazsınız. %1 ögesinden içeri aktarmak istiyor musunuz?</translation>
     </message>
     <message>
         <source>Import from container with certificate</source>
-        <translation>Sertifikayı kapsayıcıdan içe aktar</translation>
+        <translation>Sertifikayı konteynerden içe aktar</translation>
     </message>
     <message>
         <source>Do you want to trust %1 with the fingerprint of %2 from %3?</source>
@@ -6804,7 +6806,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Signed share container are not supported - import prevented</source>
-        <translation>İmzalı paylaşım kapsayıcısı desteklenmiyor -içeri alma engellendi</translation>
+        <translation>İmzalı paylaşım konteyneri desteklenmiyor -içeri alma engellendi</translation>
     </message>
     <message>
         <source>File is not readable</source>
@@ -6812,7 +6814,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Invalid sharing container</source>
-        <translation>Geçersiz kapsayıcı paylaşımı</translation>
+        <translation>Geçersiz konteyner paylaşımı</translation>
     </message>
     <message>
         <source>Untrusted import prevented</source>
@@ -6820,7 +6822,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Successful signed import</source>
-        <translation>İmzalı içe aktarma başarılır</translation>
+        <translation>İmzalı içe aktarma başarılı</translation>
     </message>
     <message>
         <source>Unexpected error</source>
@@ -6828,7 +6830,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Unsigned share container are not supported - import prevented</source>
-        <translation>İmzalanmamış paylaşım kapsayıcısı desteklenmiyor -içeri alma engellendi</translation>
+        <translation>İmzalanmamış paylaşım konteyneri desteklenmiyor -içeri alma engellendi</translation>
     </message>
     <message>
         <source>Successful unsigned import</source>
@@ -6840,7 +6842,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Unknown share container type</source>
-        <translation>Bilinmeyen kapsayıcı paylaşım türü</translation>
+        <translation>Bilinmeyen konteyner paylaşım türü</translation>
     </message>
 </context>
 <context>
@@ -6882,7 +6884,7 @@ MİB mimarisi: %2
     <name>TotpDialog</name>
     <message>
         <source>Timed Password</source>
-        <translation>Süreli Parola</translation>
+        <translation>Zamanlı Parola</translation>
     </message>
     <message>
         <source>000000</source>
@@ -6954,15 +6956,15 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Secret Key:</source>
-        <translation type="unfinished"/>
+        <translation>Gizli Anahtar:</translation>
     </message>
     <message>
         <source>Secret key must be in Base32 format</source>
-        <translation type="unfinished"/>
+        <translation>Gizli anahtar Base32 biçiminde olmalıdır</translation>
     </message>
     <message>
         <source>Secret key field</source>
-        <translation type="unfinished"/>
+        <translation>Gizli anahtar alanı</translation>
     </message>
     <message>
         <source>Algorithm:</source>
@@ -7034,7 +7036,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Download it at keepassxc.org</source>
-        <translation>Keepassxc.org adresinden indirin</translation>
+        <translation>Keepassxc.org adresinden indir</translation>
     </message>
     <message>
         <source>You&apos;re up-to-date!</source>
@@ -7081,7 +7083,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Open a recent database</source>
-        <translation type="unfinished"/>
+        <translation>Son kullanılan veritabanını aç</translation>
     </message>
 </context>
 <context>
@@ -7100,7 +7102,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
-        <translation>Hiçbir YubiKey algılanmadı, lütfen fişe takılı olduğundan emin olun.</translation>
+        <translation>YubiKey algılanmadı, lütfen takılı olduğundan emin olun.</translation>
     </message>
     <message>
         <source>No YubiKey inserted.</source>
@@ -7108,11 +7110,11 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Refresh hardware tokens</source>
-        <translation type="unfinished"/>
+        <translation>Donanım belirteçlerini yenile</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
-        <translation type="unfinished"/>
+        <translation>Donanım anahtarı yuvası seçimi</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_uk.ts b/share/translations/keepassx_uk.ts
index 76e540eee3..680514f10c 100644
--- a/share/translations/keepassx_uk.ts
+++ b/share/translations/keepassx_uk.ts
@@ -233,7 +233,7 @@
     </message>
     <message>
         <source>Remember database key files and security dongles</source>
-        <translation>Пам&apos;ятати файли ключів та апаратні ключі для сховища</translation>
+        <translation>Пам&apos;ятати файлові ключі та апаратні ключі для сховища</translation>
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
@@ -398,11 +398,11 @@
     </message>
     <message>
         <source>Touch ID inactivity reset</source>
-        <translation type="unfinished"/>
+        <translation>Скидання TouchID після бездіяльності</translation>
     </message>
     <message>
         <source>Database lock timeout seconds</source>
-        <translation type="unfinished"/>
+        <translation>Блокування сховища за часом в секундах</translation>
     </message>
     <message>
         <source> min</source>
@@ -446,11 +446,11 @@
     </message>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Необхідний дозвіл</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC потребує дозволу на доступність для виконання автозаповнення на рівні записів. Якщо Ви вже надали цей дозвіл, можливо Вам необхідно перезапустити KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -502,11 +502,11 @@
     <name>AutoTypePlatformMac</name>
     <message>
         <source>Permission Required</source>
-        <translation type="unfinished"/>
+        <translation>Необхідний дозвіл</translation>
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC потребує дозволу на доступність і запис екрану для виконання глобального автозаповнення. Запис екрану необхідний, щоб виявити зоголовок вікна для пошуку записів. Якщо Ви вже надали цей дозвіл, можливо Вам необхідно перезапустити KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -528,7 +528,7 @@
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation>Підтвердження доступу для KeePassXC-Переглядача</translation>
+        <translation>Підтвердження доступу для KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Remember this decision</source>
@@ -586,7 +586,7 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>This is required for accessing your databases with KeePassXC-Browser</source>
-        <translation>Це необхідно для надання KeePassXC-Переглядачу доступу до Ваших сховищ</translation>
+        <translation>Це необхідно для надання KeePassXC-Browser доступу до Ваших сховищ</translation>
     </message>
     <message>
         <source>General</source>
@@ -731,11 +731,11 @@ Please select the correct database for saving credentials.</source>
     </message>
     <message>
         <source>Due to Snap sandboxing, you must run a script to enable browser integration.&lt;br /&gt;You can obtain this script from %1</source>
-        <translation>Через заходи безпеки у Snap Вам необхідно виконати сценарій для сполучення з переглядачем. &lt;br /&gt;Ви можете знайти файл сценарію у %1</translation>
+        <translation>Через заходи безпеки у Snap Вам необхідно виконати сценарій для сполучення з переглядачем. &lt;br /&gt;Ви можете знайти файл сценарію в %1</translation>
     </message>
     <message>
         <source>Please see special instructions for browser extension use below</source>
-        <translation>Нижче Ви можете знайти інструкції для використання додатку для браузера</translation>
+        <translation>Нижче Ви можете знайти довідку з використання розширення переглядача</translation>
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2. %3</source>
@@ -820,16 +820,16 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Converting attributes to custom data…</source>
-        <translation>Перетворення атрибутів користувацьких даних…</translation>
+        <translation>Перетворення ознак на користувацькі дані…</translation>
     </message>
     <message>
         <source>KeePassXC: Converted KeePassHTTP attributes</source>
-        <translation>KeePassXC: Атрибути KeePassHTTP перетворено</translation>
+        <translation>KeePassXC: властивості KeePassHTTP перетворено</translation>
     </message>
     <message>
         <source>Successfully converted attributes from %1 entry(s).
 Moved %2 keys to custom data.</source>
-        <translation>Атрибути %1 запису(-ів) успішно перетворені.
+        <translation>Ознаки %1 запису(-ів) успішно перетворені.
 %2 ключів переміщено до користувацьких даних.</translation>
     </message>
     <message numerus="yes">
@@ -838,11 +838,11 @@ Moved %2 keys to custom data.</source>
     </message>
     <message>
         <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
-        <translation>KeePassXC: Записів з атрибутами KeePassHTTP не знайдено!</translation>
+        <translation>KeePassXC: Записів з властивостями KeePassHTTP не знайдено!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
-        <translation>Поточне сховище не містить запису з атрибутами KeePassHTTP.</translation>
+        <translation>Поточне сховище не містить запису з властивостями KeePassHTTP.</translation>
     </message>
     <message>
         <source>KeePassXC: Legacy browser integration settings detected</source>
@@ -864,7 +864,7 @@ Do you want to create this group?
         <source>Your KeePassXC-Browser settings need to be moved into the database settings.
 This is necessary to maintain your current browser connections.
 Would you like to migrate your existing settings now?</source>
-        <translation>Ваші параметри KeePassXC-Переглядача мають бути переміщени до параметрів сховища.
+        <translation>Параметри Вашого KeePassXC-Browser мають бути переміщеними до параметрів сховища.
 Це необхідно для підтримання сполучень з Вашим поточним переглядачем.
 Бажаєте перемістити параметри зараз?</translation>
     </message>
@@ -878,7 +878,11 @@ Would you like to migrate your existing settings now?</source>
 
 Give the connection a unique name or ID, for example:
 chrome-laptop.</source>
-        <translation type="unfinished"/>
+        <translation>Ви одержали запит на сполучення з таким сховищем:
+%1
+
+Надайте сполученню унікальне ім&apos;я або ідентифікатор, наприклад:
+chrome-на-ноутбуці.</translation>
     </message>
 </context>
 <context>
@@ -1086,7 +1090,7 @@ Backup database located at %2</source>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Key File:</source>
-        <translation>Файл-ключ:</translation>
+        <translation>Файловий ключ:</translation>
     </message>
     <message>
         <source>Refresh</source>
@@ -1094,17 +1098,17 @@ Backup database located at %2</source>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Застарілий формат файла-ключа</translation>
+        <translation>Застарілий формат файлового ключа</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation>Ви використовуєте застарілий формат файла-ключа, підтримку якого
+        <translation>Ви використовуєте застарілий формат файлового ключа, підтримку якого
 може бути скасовано у майбутньому.
 
-Бажано створити новий файл-ключ.</translation>
+Бажано створити новий файловий ключ.</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
@@ -1116,15 +1120,15 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Key files</source>
-        <translation>Файли-ключі</translation>
+        <translation>Файлові ключі</translation>
     </message>
     <message>
         <source>Select key file</source>
-        <translation>Оберіть файл-ключ</translation>
+        <translation>Оберіть файловий ключ</translation>
     </message>
     <message>
         <source>Failed to open key file: %1</source>
-        <translation>Відкриття файла ключа зазнало невдачі: %1</translation>
+        <translation>Відкриття файлового ключа зазнало невдачі: %1</translation>
     </message>
     <message>
         <source>Select slot...</source>
@@ -1148,7 +1152,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation>Вибір файла ключа</translation>
+        <translation>Вибір файлового ключа</translation>
     </message>
     <message>
         <source>Hardware key slot selection</source>
@@ -1156,7 +1160,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Вибрати файл ключа</translation>
+        <translation>Вибрати файловий ключ</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1184,7 +1188,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Clear Key File</source>
-        <translation>Очистити файл ключа</translation>
+        <translation>Очистити файловий ключ</translation>
     </message>
     <message>
         <source>Unlock failed and no password given</source>
@@ -1206,37 +1210,39 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
     </message>
     <message>
         <source>Enter Additional Credentials (if any):</source>
-        <translation type="unfinished"/>
+        <translation>Введіть додаткові реєстраційні дані (якщо є):</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Ви можете використовувати апаратний ключ захисту на кшталт &lt;strong&gt;YubiKey&lt;/strong&gt; чи &lt;strong&gt;OnlyKey&lt;/strong&gt; з гніздами налаштованими під HMAC-SHA1.&lt;/p&gt;
+&lt;p&gt;Натисніть тут для додаткової інформації...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;На додаток до Вашого головного пароля Ви можете використовувати таємний файл для посилення захисту Вашого сховища. Такий файл можна створити у розділі налаштування безпеки Вашого сховища.&lt;/p&gt;&lt;p&gt;Цей файл &lt;strong&gt;відрізняється&lt;/strong&gt; від Вашого файла сховища *.kdbx!&lt;br&gt;Якщо у Вас немає файлового ключа, залиште це поле порожнім.&lt;/p&gt;&lt;p&gt;Натисніть тут для додаткової інформації...&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Key file help</source>
-        <translation type="unfinished"/>
+        <translation>Довідка щодо файлового ключа</translation>
     </message>
     <message>
         <source>?</source>
-        <translation type="unfinished"/>
+        <translation>?</translation>
     </message>
     <message>
         <source>Select key file...</source>
-        <translation type="unfinished"/>
+        <translation>Вибрати файловий ключ...</translation>
     </message>
     <message>
         <source>Cannot use database file as key file</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо використати файл сховища як файловий ключ</translation>
     </message>
     <message>
         <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
-        <translation type="unfinished"/>
+        <translation>Ви не можете використовувати файл сховища як файловий ключ.
+Якщо у Вас немає файлового ключа, залиште, будь ласка, це поле порожнім.</translation>
     </message>
 </context>
 <context>
@@ -1289,7 +1295,7 @@ If you do not have a key file, please leave the field empty.</source>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
-        <translation>Перемістити атрибути KeePassHTTP до &amp;користувацьких даних у KeePassXC-переглядачі</translation>
+        <translation>Перемістити властивості KeePassHTTP до &amp;користувацьких даних у KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Stored keys</source>
@@ -1383,7 +1389,7 @@ Permissions to access entries will be revoked.</source>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to custom data</source>
-        <translation>Перемістити атрибути KeePassHTTP до користувацьких даних</translation>
+        <translation>Перемістити властивості KeePassHTTP до користувацьких даних</translation>
     </message>
     <message>
         <source>Do you really want to move all legacy browser integration data to the latest standard?
@@ -1578,19 +1584,19 @@ If you keep this number, your database may be too easy to crack!</source>
     <name>DatabaseSettingsWidgetFdoSecrets</name>
     <message>
         <source>Exposed Entries</source>
-        <translation type="unfinished"/>
+        <translation>Виставлені записи</translation>
     </message>
     <message>
         <source>Don&apos;t e&amp;xpose this database</source>
-        <translation type="unfinished"/>
+        <translation>Не виставляти це сховище</translation>
     </message>
     <message>
         <source>Expose entries &amp;under this group:</source>
-        <translation type="unfinished"/>
+        <translation>Виставити записи &amp;з такої групи:</translation>
     </message>
     <message>
         <source>Enable fd.o Secret Service to access these settings.</source>
-        <translation type="unfinished"/>
+        <translation>Увімкніть fd.o Таємної служби для доступу до цих параметрів.</translation>
     </message>
 </context>
 <context>
@@ -1653,7 +1659,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Maximum number of history items per entry</source>
-        <translation type="unfinished"/>
+        <translation>Найбільша кількість заміток журналу для запису</translation>
     </message>
     <message>
         <source>Maximum size of history per entry</source>
@@ -1666,11 +1672,12 @@ If you keep this number, your database may be too easy to crack!</source>
     <message>
         <source>Do you want to delete the current recycle bin and all its contents?
 This action is not reversible.</source>
-        <translation type="unfinished"/>
+        <translation>Ви дійсно хочете видалити смітник і весь його вміст?
+Відновлення буде неможливим.</translation>
     </message>
     <message>
         <source> (old)</source>
-        <translation type="unfinished"/>
+        <translation> (старий)</translation>
     </message>
 </context>
 <context>
@@ -1771,7 +1778,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Hover over lines with error icons for further information.</source>
-        <translation type="unfinished"/>
+        <translation>Наведіть мишкою на рядки зі значком помилки для додаткової інформації.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1791,7 +1798,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Location</source>
-        <translation type="unfinished"/>
+        <translation>Розташування</translation>
     </message>
     <message>
         <source>Last saved</source>
@@ -1799,7 +1806,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Unsaved changes</source>
-        <translation type="unfinished"/>
+        <translation>Незбережені зміни</translation>
     </message>
     <message>
         <source>yes</source>
@@ -1811,7 +1818,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>The database was modified, but the changes have not yet been saved to disk.</source>
-        <translation type="unfinished"/>
+        <translation>Сховище було змінено, але поточні зміни ще не було записано на диск.</translation>
     </message>
     <message>
         <source>Number of groups</source>
@@ -1827,59 +1834,59 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>The database contains entries that have expired.</source>
-        <translation type="unfinished"/>
+        <translation>Сховище містить знечинені записи.</translation>
     </message>
     <message>
         <source>Unique passwords</source>
-        <translation type="unfinished"/>
+        <translation>Унікальні паролі</translation>
     </message>
     <message>
         <source>Non-unique passwords</source>
-        <translation type="unfinished"/>
+        <translation>Повторювані паролі</translation>
     </message>
     <message>
         <source>More than 10% of passwords are reused. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Понад 10% паролів повторюються. Використовуйте унікальні паролі завжди, коли це можливо.</translation>
     </message>
     <message>
         <source>Maximum password reuse</source>
-        <translation type="unfinished"/>
+        <translation>Найбільша кількість повторень паролю</translation>
     </message>
     <message>
         <source>Some passwords are used more than three times. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Деякі паролі використано понад три рази. Використовуйте унікальні паролі завжди, коли це можливо.</translation>
     </message>
     <message>
         <source>Number of short passwords</source>
-        <translation type="unfinished"/>
+        <translation>Кількість коротких паролів</translation>
     </message>
     <message>
         <source>Recommended minimum password length is at least 8 characters.</source>
-        <translation type="unfinished"/>
+        <translation>Рекомендована найменша довжина пароля — 8 символів.</translation>
     </message>
     <message>
         <source>Number of weak passwords</source>
-        <translation type="unfinished"/>
+        <translation>Кількість слабких паролів</translation>
     </message>
     <message>
         <source>Recommend using long, randomized passwords with a rating of &apos;good&apos; or &apos;excellent&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Рекомендовано використовувати довгі, випадкові паролі з оцінкою «добре» або «відмінно».</translation>
     </message>
     <message>
         <source>Average password length</source>
-        <translation type="unfinished"/>
+        <translation>Середня довжина пароля</translation>
     </message>
     <message>
         <source>%1 characters</source>
-        <translation type="unfinished"/>
+        <translation>%1 символів</translation>
     </message>
     <message>
         <source>Average password length is less than ten characters. Longer passwords provide more security.</source>
-        <translation type="unfinished"/>
+        <translation>Середня довжина пароля менша 10 символів. Довші паролі покращують безпеку.</translation>
     </message>
     <message>
         <source>Please wait, database statistics are being calculated...</source>
-        <translation type="unfinished"/>
+        <translation>Зачекайте, будь ласка, триває обчислення статистики сховища...</translation>
     </message>
 </context>
 <context>
@@ -1955,27 +1962,27 @@ This is definitely a bug, please report it to the developers.</source>
     </message>
     <message>
         <source>Failed to open %1. It either does not exist or is not accessible.</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося відкрити %1. Він або не існує, або не є доступним.</translation>
     </message>
     <message>
         <source>Export database to HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Експортувати сховище в HTML</translation>
     </message>
     <message>
         <source>HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Файл HTML</translation>
     </message>
     <message>
         <source>Writing the HTML file failed.</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося записати файл HTML.</translation>
     </message>
     <message>
         <source>Export Confirmation</source>
-        <translation type="unfinished"/>
+        <translation>Схвалення експорту</translation>
     </message>
     <message>
         <source>You are about to export your database to an unencrypted file. This will leave your passwords and sensitive information vulnerable! Are you sure you want to continue?</source>
-        <translation type="unfinished"/>
+        <translation>Ви збираєтесь експортувати Ваше сховище в незашифрований файл. Це зробить Ваші паролі і вразливі дані незахищеними! Ви дійсно бажаєте продовжити?</translation>
     </message>
 </context>
 <context>
@@ -2156,7 +2163,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>This database is opened in read-only mode. Autosave is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Сховище відкрито у режимі читання. Автоматичне збереження вимкнено.</translation>
     </message>
 </context>
 <context>
@@ -2227,11 +2234,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>New attribute</source>
-        <translation>Новий атрибут</translation>
+        <translation>Нова ознака</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this attribute?</source>
-        <translation>Ви дійсно бажаєте видалити цей атрибут?</translation>
+        <translation>Ви дійсно бажаєте видалити цю ознаку?</translation>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -2263,7 +2270,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>New attribute %1</source>
-        <translation>Новий атрибут %1</translation>
+        <translation>Нова ознака %1</translation>
     </message>
     <message>
         <source>[PROTECTED] Press reveal to view or edit</source>
@@ -2283,18 +2290,18 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>&lt;empty URL&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;порожній URL&gt;</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this URL?</source>
-        <translation type="unfinished"/>
+        <translation>Ви дійсно бажаєте видалити цей URL?</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
     <message>
         <source>Additional attributes</source>
-        <translation>Додаткові атрибути</translation>
+        <translation>Додаткові ознаки</translation>
     </message>
     <message>
         <source>Add</source>
@@ -2330,39 +2337,39 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Attribute selection</source>
-        <translation type="unfinished"/>
+        <translation>Вибір ознаки</translation>
     </message>
     <message>
         <source>Attribute value</source>
-        <translation type="unfinished"/>
+        <translation>Значення ознаки</translation>
     </message>
     <message>
         <source>Add a new attribute</source>
-        <translation type="unfinished"/>
+        <translation>Додати нову ознаку</translation>
     </message>
     <message>
         <source>Remove selected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Видалити вибрану ознаку</translation>
     </message>
     <message>
         <source>Edit attribute name</source>
-        <translation type="unfinished"/>
+        <translation>Змінити назву ознаки</translation>
     </message>
     <message>
         <source>Toggle attribute protection</source>
-        <translation type="unfinished"/>
+        <translation>Перемкнути захист ознаки</translation>
     </message>
     <message>
         <source>Show a protected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Показати захищену ознаку</translation>
     </message>
     <message>
         <source>Foreground color selection</source>
-        <translation type="unfinished"/>
+        <translation>Вибір кольору переднього плану</translation>
     </message>
     <message>
         <source>Background color selection</source>
-        <translation type="unfinished"/>
+        <translation>Вибір кольору тла</translation>
     </message>
 </context>
 <context>
@@ -2401,46 +2408,46 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Custom Auto-Type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Власна послідовність автозаповнення</translation>
     </message>
     <message>
         <source>Open Auto-Type help webpage</source>
-        <translation type="unfinished"/>
+        <translation>Відкрити сторінку довідки щодо автозаповнення</translation>
     </message>
     <message>
         <source>Existing window associations</source>
-        <translation type="unfinished"/>
+        <translation>Наявні прив&apos;язки вікон</translation>
     </message>
     <message>
         <source>Add new window association</source>
-        <translation type="unfinished"/>
+        <translation>Додати нову прив&apos;язку вікна</translation>
     </message>
     <message>
         <source>Remove selected window association</source>
-        <translation type="unfinished"/>
+        <translation>Видалити вибрану прив&apos;язку вікна</translation>
     </message>
     <message>
         <source>You can use an asterisk (*) to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Ви можете використовувати зірочку (*) для довільних збігів</translation>
     </message>
     <message>
         <source>Set the window association title</source>
-        <translation type="unfinished"/>
+        <translation>Встановити заголовок для прив&apos;язки вікна</translation>
     </message>
     <message>
         <source>You can use an asterisk to match everything</source>
-        <translation type="unfinished"/>
+        <translation>Ви можете використовувати зірочку для довільних збігів</translation>
     </message>
     <message>
         <source>Custom Auto-Type sequence for this window</source>
-        <translation type="unfinished"/>
+        <translation>Власна послідовність автозаповнення для цього вікна</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetBrowser</name>
     <message>
         <source>These settings affect to the entry&apos;s behaviour with the browser extension.</source>
-        <translation type="unfinished"/>
+        <translation>Ці параметри впливають на поведінку запису в розширенні переглядача.</translation>
     </message>
     <message>
         <source>General</source>
@@ -2448,15 +2455,15 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Skip Auto-Submit for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Пропускати автоматичне надсилання для цього запису</translation>
     </message>
     <message>
         <source>Hide this entry from the browser extension</source>
-        <translation type="unfinished"/>
+        <translation>Сховати цей запис від розширення переглядача</translation>
     </message>
     <message>
         <source>Additional URL&apos;s</source>
-        <translation type="unfinished"/>
+        <translation>Додаткові URL</translation>
     </message>
     <message>
         <source>Add</source>
@@ -2491,23 +2498,23 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Entry history selection</source>
-        <translation type="unfinished"/>
+        <translation>Вибір журналу запису</translation>
     </message>
     <message>
         <source>Show entry at selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Показати вибраний хронологічний стан запису</translation>
     </message>
     <message>
         <source>Restore entry to selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Відновити запис з вибраного хронологічного стану</translation>
     </message>
     <message>
         <source>Delete selected history state</source>
-        <translation type="unfinished"/>
+        <translation>Видалити вибраний хронологічний стан</translation>
     </message>
     <message>
         <source>Delete all history</source>
-        <translation type="unfinished"/>
+        <translation>Видалити весь журнал</translation>
     </message>
 </context>
 <context>
@@ -2550,19 +2557,19 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Url field</source>
-        <translation type="unfinished"/>
+        <translation>Поле URL</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Завантажити фавікон для URL</translation>
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Поле повторення пароля</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Перемкнути генератор паролів</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -2574,35 +2581,35 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Toggle notes visible</source>
-        <translation type="unfinished"/>
+        <translation>Перемкнути видимість нотаток</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Поле знечинення</translation>
     </message>
     <message>
         <source>Expiration Presets</source>
-        <translation type="unfinished"/>
+        <translation>Типове налаштування знечинення</translation>
     </message>
     <message>
         <source>Expiration presets</source>
-        <translation type="unfinished"/>
+        <translation>Типове налаштування знечинення</translation>
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Поле нотаток</translation>
     </message>
     <message>
         <source>Title field</source>
-        <translation type="unfinished"/>
+        <translation>Поле заголовка</translation>
     </message>
     <message>
         <source>Username field</source>
-        <translation type="unfinished"/>
+        <translation>Поле імені користувача</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation type="unfinished"/>
+        <translation>Перемкнути знечинення</translation>
     </message>
 </context>
 <context>
@@ -2682,19 +2689,19 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
-        <translation type="unfinished"/>
+        <translation>Видалити ключ з агенту після вказаної кількості секунд</translation>
     </message>
     <message>
         <source>Browser for key file</source>
-        <translation type="unfinished"/>
+        <translation>Переглядач файлових ключів</translation>
     </message>
     <message>
         <source>External key file</source>
-        <translation type="unfinished"/>
+        <translation>Зовнішній файловий ключ</translation>
     </message>
     <message>
         <source>Select attachment file</source>
-        <translation type="unfinished"/>
+        <translation>Вибрати файл вкладення</translation>
     </message>
 </context>
 <context>
@@ -2796,49 +2803,50 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"/>
+        <translation>Узгодити</translation>
     </message>
     <message>
         <source>Your KeePassXC version does not support sharing this container type.
 Supported extensions are: %1.</source>
-        <translation type="unfinished"/>
+        <translation>Ваша версія KeePassXC не підтримує спільне використання цього типу оболонки.
+Підтримані розширення: %1.</translation>
     </message>
     <message>
         <source>%1 is already being exported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>Сховище вже експортує %1.</translation>
     </message>
     <message>
         <source>%1 is already being imported by this database.</source>
-        <translation type="unfinished"/>
+        <translation>Сховище вже імпортує %1.</translation>
     </message>
     <message>
         <source>%1 is being imported and exported by different groups in this database.</source>
-        <translation type="unfinished"/>
+        <translation>У цьому сховищі %1 експортують і імпортують різні групи.</translation>
     </message>
     <message>
         <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
         <comment>KeeShare is a proper noun</comment>
-        <translation type="unfinished"/>
+        <translation>KeeShare наразі вимкнено. Ви можете ввімкнути імпорт та експорт у налаштуванні застосунку.</translation>
     </message>
     <message>
         <source>Database export is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Експорт сховища наразі вимкнено в налаштуванні застосунку.</translation>
     </message>
     <message>
         <source>Database import is currently disabled by application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Імпорт сховища наразі вимкнено в налаштуванні застосунку.</translation>
     </message>
     <message>
         <source>Sharing mode field</source>
-        <translation type="unfinished"/>
+        <translation>Поле режиму спільного використання</translation>
     </message>
     <message>
         <source>Path to share file field</source>
-        <translation type="unfinished"/>
+        <translation>Поле шляху до спільного файлу</translation>
     </message>
     <message>
         <source>Browser for share file</source>
-        <translation type="unfinished"/>
+        <translation>Вибрати файл для спільного використання</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -2850,11 +2858,11 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Перемкнути генератор паролів</translation>
     </message>
     <message>
         <source>Clear fields</source>
-        <translation type="unfinished"/>
+        <translation>Очистити поля</translation>
     </message>
 </context>
 <context>
@@ -2889,31 +2897,31 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Name field</source>
-        <translation type="unfinished"/>
+        <translation>Поле назви</translation>
     </message>
     <message>
         <source>Notes field</source>
-        <translation type="unfinished"/>
+        <translation>Поле нотаток</translation>
     </message>
     <message>
         <source>Toggle expiration</source>
-        <translation type="unfinished"/>
+        <translation>Перемкнути знечинення</translation>
     </message>
     <message>
         <source>Auto-Type toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Перемикання автозаповнення для цієї групи і всіх дочерніх груп</translation>
     </message>
     <message>
         <source>Expiration field</source>
-        <translation type="unfinished"/>
+        <translation>Поле знечинення</translation>
     </message>
     <message>
         <source>Search toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Перемикання пошуку для цієї групи і всіх дочерніх груп</translation>
     </message>
     <message>
         <source>Default auto-type sequence field</source>
-        <translation type="unfinished"/>
+        <translation>Поле типової послідовності автозаповнення</translation>
     </message>
 </context>
 <context>
@@ -2980,39 +2988,39 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
-        <translation type="unfinished"/>
+        <translation>Ви можете ввімкнути службу значків DuckDuckGo в меню Інструменти -&gt; Налаштування -&gt; Безпека</translation>
     </message>
     <message>
         <source>Download favicon for URL</source>
-        <translation type="unfinished"/>
+        <translation>Завантажити фавікон для URL</translation>
     </message>
     <message>
         <source>Apply selected icon to subgroups and entries</source>
-        <translation type="unfinished"/>
+        <translation>Застосувати вибраній значок для дочерніх груп і записів</translation>
     </message>
     <message>
         <source>Apply icon &amp;to ...</source>
-        <translation type="unfinished"/>
+        <translation>Застосувати значок до...</translation>
     </message>
     <message>
         <source>Apply to this only</source>
-        <translation type="unfinished"/>
+        <translation>Застосувати тільки для цього</translation>
     </message>
     <message>
         <source>Also apply to child groups</source>
-        <translation type="unfinished"/>
+        <translation>Також застосувати до дочерніх груп</translation>
     </message>
     <message>
         <source>Also apply to child entries</source>
-        <translation type="unfinished"/>
+        <translation>Також застосувати до дочерніх записів</translation>
     </message>
     <message>
         <source>Also apply to all children</source>
-        <translation type="unfinished"/>
+        <translation>Також застосувати до всіх дочерніх елементів</translation>
     </message>
     <message>
         <source>Existing icon selected.</source>
-        <translation type="unfinished"/>
+        <translation>Вибрано наявний значок.</translation>
     </message>
 </context>
 <context>
@@ -3061,27 +3069,27 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Datetime created</source>
-        <translation type="unfinished"/>
+        <translation>Дата й час створення</translation>
     </message>
     <message>
         <source>Datetime modified</source>
-        <translation type="unfinished"/>
+        <translation>Дата й час зміни</translation>
     </message>
     <message>
         <source>Datetime accessed</source>
-        <translation type="unfinished"/>
+        <translation>Дата й час доступу</translation>
     </message>
     <message>
         <source>Unique ID</source>
-        <translation type="unfinished"/>
+        <translation>Унікальний ідентифікатор</translation>
     </message>
     <message>
         <source>Plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Дані модуля</translation>
     </message>
     <message>
         <source>Remove selected plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Видалити дані вибраного модуля</translation>
     </message>
 </context>
 <context>
@@ -3183,23 +3191,23 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Вкладення</translation>
+        <translation>Додатки</translation>
     </message>
     <message>
         <source>Add new attachment</source>
-        <translation type="unfinished"/>
+        <translation>Долучити новий додаток</translation>
     </message>
     <message>
         <source>Remove selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Видалити вибраний додаток</translation>
     </message>
     <message>
         <source>Open selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Відкрити вибраний додаток</translation>
     </message>
     <message>
         <source>Save selected attachment to disk</source>
-        <translation type="unfinished"/>
+        <translation>Зберегти вибраний додаток на диск</translation>
     </message>
 </context>
 <context>
@@ -3320,11 +3328,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Attributes</source>
-        <translation>Атрибути</translation>
+        <translation>Ознаки</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Вкладення</translation>
+        <translation>Долучення</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3381,7 +3389,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Display current TOTP value</source>
-        <translation type="unfinished"/>
+        <translation>Показати значення поточного ТОП</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -3423,26 +3431,26 @@ This may cause the affected plugins to malfunction.</source>
     <name>FdoSecrets::Item</name>
     <message>
         <source>Entry &quot;%1&quot; from database &quot;%2&quot; was used by %3</source>
-        <translation type="unfinished"/>
+        <translation>Програма %3 використала запис &quot;%1&quot; зі сховища &quot;%2&quot;</translation>
     </message>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
     <message>
         <source>Failed to register DBus service at %1: another secret service is running.</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося зареєструвати службу DBus в %1: інша таємна служба вже працює.</translation>
     </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 використовує %n запис</numerusform><numerusform>%1 використовує %n записи</numerusform><numerusform>%1 використовує %n записів</numerusform><numerusform>%1 використовує %n записів</numerusform></translation>
     </message>
 </context>
 <context>
     <name>FdoSecretsPlugin</name>
     <message>
         <source>Fdo Secret Service: %1</source>
-        <translation type="unfinished"/>
+        <translation>Таємна служба Fdo: %1</translation>
     </message>
 </context>
 <context>
@@ -3468,7 +3476,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation type="unfinished"/>
+        <translation>Завантажити фавікони</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -3477,7 +3485,8 @@ This may cause the affected plugins to malfunction.</source>
     <message>
         <source>Having trouble downloading icons?
 You can enable the DuckDuckGo website icon service in the security section of the application settings.</source>
-        <translation type="unfinished"/>
+        <translation>Маєте проблеми з завантаженням значків?
+Ви можете ввімкнути службу значків DuckDuckGo в налаштуванні застосунку в розділі безпеки.</translation>
     </message>
     <message>
         <source>Close</source>
@@ -3493,11 +3502,11 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Please wait, processing entry list...</source>
-        <translation type="unfinished"/>
+        <translation>Зачекайте, будь ласка, триває оброблення списку записів...</translation>
     </message>
     <message>
         <source>Downloading...</source>
-        <translation type="unfinished"/>
+        <translation>Завантаження...</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -3505,15 +3514,15 @@ You can enable the DuckDuckGo website icon service in the security section of th
     </message>
     <message>
         <source>Already Exists</source>
-        <translation type="unfinished"/>
+        <translation>Вже існує</translation>
     </message>
     <message>
         <source>Download Failed</source>
-        <translation type="unfinished"/>
+        <translation>Завантаження зазнало невдачі</translation>
     </message>
     <message>
         <source>Downloading favicons (%1/%2)...</source>
-        <translation type="unfinished"/>
+        <translation>Завантаження фавіконів (%1/%2)...</translation>
     </message>
 </context>
 <context>
@@ -3560,7 +3569,7 @@ You can enable the DuckDuckGo website icon service in the security section of th
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Надано хибні реєстраційні дані. Спробуйте, будь ласка, ще раз. Якщо це повторюватиметься, файл Вашого сховища може бути пошкодженим.</translation>
     </message>
 </context>
 <context>
@@ -3695,11 +3704,12 @@ If this reoccurs, then your database file may be corrupt.</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Надано хибні реєстраційні дані. Спробуйте, будь ласка, ще раз.
+Якщо це повторюватиметься, файл Вашого сховища може бути пошкодженим.</translation>
     </message>
     <message>
         <source>(HMAC mismatch)</source>
-        <translation type="unfinished"/>
+        <translation>(неузгідність HMAC)</translation>
     </message>
 </context>
 <context>
@@ -3864,7 +3874,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Duplicate custom attribute found</source>
-        <translation>Знайдено дублікат Вашого власного атрибута</translation>
+        <translation>Знайдено дублікат Вашої власної ознаки</translation>
     </message>
     <message>
         <source>Entry string key or value missing</source>
@@ -3928,7 +3938,7 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Import KeePass1 Database</source>
-        <translation type="unfinished"/>
+        <translation>Імпортувати сховище KeePass1</translation>
     </message>
 </context>
 <context>
@@ -4085,18 +4095,19 @@ Line %2, column %3</source>
     <message>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
-        <translation type="unfinished"/>
+        <translation>Надано хибні реєстраційні дані. Спробуйте, будь ласка, ще раз.
+Якщо це повторюватиметься, файл Вашого сховища може бути пошкодженим.</translation>
     </message>
 </context>
 <context>
     <name>KeeShare</name>
     <message>
         <source>Invalid sharing reference</source>
-        <translation type="unfinished"/>
+        <translation>Хибне спільне посилання</translation>
     </message>
     <message>
         <source>Inactive share %1</source>
-        <translation type="unfinished"/>
+        <translation>Бездіяльне спільне використання %1</translation>
     </message>
     <message>
         <source>Imported from %1</source>
@@ -4104,35 +4115,35 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Exported to %1</source>
-        <translation type="unfinished"/>
+        <translation>Експортовано в %1</translation>
     </message>
     <message>
         <source>Synchronized with %1</source>
-        <translation type="unfinished"/>
+        <translation>Узгоджено з %1</translation>
     </message>
     <message>
         <source>Import is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Імпорт вимкнено у параметрах</translation>
     </message>
     <message>
         <source>Export is disabled in settings</source>
-        <translation type="unfinished"/>
+        <translation>Експорт вимкнено у параметрах</translation>
     </message>
     <message>
         <source>Inactive share</source>
-        <translation type="unfinished"/>
+        <translation>Бездіяльне спільне використання</translation>
     </message>
     <message>
         <source>Imported from</source>
-        <translation type="unfinished"/>
+        <translation>Імпортовано з</translation>
     </message>
     <message>
         <source>Exported to</source>
-        <translation type="unfinished"/>
+        <translation>Експортовано в</translation>
     </message>
     <message>
         <source>Synchronized with</source>
-        <translation type="unfinished"/>
+        <translation>Узгоджено з</translation>
     </message>
 </context>
 <context>
@@ -4182,35 +4193,35 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Key File</source>
-        <translation>Файл-ключ</translation>
+        <translation>Файловий ключ</translation>
     </message>
     <message>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ви можете додати файл-ключ, що містить випадкові байти для покращення безпеки.&lt;/p&gt;&lt;p&gt;Ви мусите зберігати його таємно і не губити, інакше Ви не зможете відкрити сховище.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Ви можете додати файловий ключ, що містить випадкові байти для покращення безпеки.&lt;/p&gt;&lt;p&gt;Ви мусите зберігати його таємно і не губити, інакше Ви не зможете відкрити сховище.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Застарілий формат файла-ключа</translation>
+        <translation>Застарілий формат файлового ключа</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please go to the master key settings and generate a new key file.</source>
-        <translation>Ви використовуєте застарілий формат файла-ключа, підтримку якого
+        <translation>Ви використовуєте застарілий формат файлового ключа, підтримання якого
 може бути скасовано у майбутньому.
 
-Будь ласка, перейдіть до налаштування головного ключа і створіть новий файл-ключ.</translation>
+Будь ласка, перейдіть до налаштування головного ключа і створіть новий файловий ключ.</translation>
     </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
-        <translation>Помилка завантаження файла-ключа &apos;%1&apos;
+        <translation>Помилка завантаження файлового ключа &apos;%1&apos;
 Повідомлення: %2</translation>
     </message>
     <message>
         <source>Key files</source>
-        <translation>Файли-ключі</translation>
+        <translation>Файлові ключі</translation>
     </message>
     <message>
         <source>All files</source>
@@ -4218,27 +4229,27 @@ Message: %2</source>
     </message>
     <message>
         <source>Create Key File...</source>
-        <translation>Створити файл-ключ...</translation>
+        <translation>Створити файловий ключ...</translation>
     </message>
     <message>
         <source>Error creating key file</source>
-        <translation>Помилка створення файла-ключа</translation>
+        <translation>Помилка створення файлового ключа</translation>
     </message>
     <message>
         <source>Unable to create key file: %1</source>
-        <translation>Неможливо створити файл-ключ: %1</translation>
+        <translation>Неможливо створити файловий ключ: %1</translation>
     </message>
     <message>
         <source>Select a key file</source>
-        <translation>Обрати файл-ключ</translation>
+        <translation>Обрати файловий ключ</translation>
     </message>
     <message>
         <source>Key file selection</source>
-        <translation>Вибір файла ключа</translation>
+        <translation>Вибір файлового ключа</translation>
     </message>
     <message>
         <source>Browse for key file</source>
-        <translation>Вибрати файл ключа</translation>
+        <translation>Вибір файлового ключа</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -4246,28 +4257,29 @@ Message: %2</source>
     </message>
     <message>
         <source>Generate a new key file</source>
-        <translation type="unfinished"/>
+        <translation>Створити новий файловий ключ</translation>
     </message>
     <message>
         <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
+        <translation>Увага: не використовуйте файл, що може змінитися у майбутньому, інакше Ви не зможете розблокувати Ваше сховище!</translation>
     </message>
     <message>
         <source>Invalid Key File</source>
-        <translation type="unfinished"/>
+        <translation>Хибний файловий ключ</translation>
     </message>
     <message>
         <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>Ви не можете використати поточне сховище як файловий ключ. Будь ласка, виберіть інший файл або створіть новий файловий ключ.</translation>
     </message>
     <message>
         <source>Suspicious Key File</source>
-        <translation type="unfinished"/>
+        <translation>Підозрілий файловий ключ</translation>
     </message>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation type="unfinished"/>
+        <translation>Вибраний фаловий ключ схожий на файл сховища паролів. Файловий ключ мусить бути незмінним файлом, який ніколи не змінюють, інакше Ви назавжди втратите доступ до Вашого сховища.
+Ви певні, що хочете продовжити з цим файлом?</translation>
     </message>
 </context>
 <context>
@@ -4278,7 +4290,7 @@ Are you sure you want to continue with this file?</source>
     </message>
     <message>
         <source>&amp;Recent databases</source>
-        <translation>&amp;Останні сховища</translation>
+        <translation>&amp;Недавні сховища</translation>
     </message>
     <message>
         <source>&amp;Help</source>
@@ -4451,7 +4463,7 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
     <message>
         <source>Copy att&amp;ribute...</source>
-        <translation>Скопіювати атрибут...</translation>
+        <translation>Скопіювати ознаку...</translation>
     </message>
     <message>
         <source>TOTP...</source>
@@ -4561,27 +4573,27 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Експорт</translation>
     </message>
     <message>
         <source>&amp;Check for Updates...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Перевірити наявність оновлень...</translation>
     </message>
     <message>
         <source>Downlo&amp;ad all favicons</source>
-        <translation type="unfinished"/>
+        <translation>Завантажити всі &amp;фавікони</translation>
     </message>
     <message>
         <source>Sort &amp;A-Z</source>
-        <translation type="unfinished"/>
+        <translation>Впорядкувати &amp;А-Я</translation>
     </message>
     <message>
         <source>Sort &amp;Z-A</source>
-        <translation type="unfinished"/>
+        <translation>Впорядкувати &amp;Я-А</translation>
     </message>
     <message>
         <source>&amp;Password Generator</source>
-        <translation type="unfinished"/>
+        <translation>Генератор паролів</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -4589,43 +4601,43 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>&amp;Export to HTML file...</source>
-        <translation type="unfinished"/>
+        <translation>Експортувати у файл HTML...</translation>
     </message>
     <message>
         <source>1Password Vault...</source>
-        <translation type="unfinished"/>
+        <translation>Сховище 1Password...</translation>
     </message>
     <message>
         <source>Import a 1Password Vault</source>
-        <translation type="unfinished"/>
+        <translation>Імпортувати сховище 1Password</translation>
     </message>
     <message>
         <source>&amp;Getting Started</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Вступ</translation>
     </message>
     <message>
         <source>Open Getting Started Guide PDF</source>
-        <translation type="unfinished"/>
+        <translation>Відкрити PDF вступного довідника</translation>
     </message>
     <message>
         <source>&amp;Online Help...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Довідка в мережі...</translation>
     </message>
     <message>
         <source>Go to online documentation (opens browser)</source>
-        <translation type="unfinished"/>
+        <translation>Перейти до документації в мережі (запускає переглядач)</translation>
     </message>
     <message>
         <source>&amp;User Guide</source>
-        <translation type="unfinished"/>
+        <translation>Довідник &amp;користувача</translation>
     </message>
     <message>
         <source>Open User Guide PDF</source>
-        <translation type="unfinished"/>
+        <translation>Відкрити PDF довідника користувача</translation>
     </message>
     <message>
         <source>&amp;Keyboard Shortcuts</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Сполучення клавіш</translation>
     </message>
 </context>
 <context>
@@ -4688,11 +4700,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Removed custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Видалено користувацькі дані %1 [%2]</translation>
     </message>
     <message>
         <source>Adding custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Додавання користувацьких даних %1 [%2]</translation>
     </message>
 </context>
 <context>
@@ -4767,31 +4779,31 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <name>OpData01</name>
     <message>
         <source>Invalid OpData01, does not contain header</source>
-        <translation type="unfinished"/>
+        <translation>Хибні OpData01, заголовок відсутній</translation>
     </message>
     <message>
         <source>Unable to read all IV bytes, wanted 16 but got %1</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо прочитати всі IV байти, потрібно 16 але одержано %1</translation>
     </message>
     <message>
         <source>Unable to init cipher for opdata01: %1</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо започаткувати шифр для opdata01: %1</translation>
     </message>
     <message>
         <source>Unable to read all HMAC signature bytes</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо прочитати всі байти підпису HMAC</translation>
     </message>
     <message>
         <source>Malformed OpData01 due to a failed HMAC</source>
-        <translation type="unfinished"/>
+        <translation>OpData01 спотворені через схиблений HMAC</translation>
     </message>
     <message>
         <source>Unable to process clearText in place</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо обробити відкритий текст на місці</translation>
     </message>
     <message>
         <source>Expected %1 bytes of clear-text, found %2</source>
-        <translation type="unfinished"/>
+        <translation>Очікувалось %1 байтів відкритого текстку, знайдено %2</translation>
     </message>
 </context>
 <context>
@@ -4799,41 +4811,42 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <message>
         <source>Read Database did not produce an instance
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Зчитування сховища не створило примірник
+%1</translation>
     </message>
 </context>
 <context>
     <name>OpVaultReader</name>
     <message>
         <source>Directory .opvault must exist</source>
-        <translation type="unfinished"/>
+        <translation>Тека .opvault мусить існувати</translation>
     </message>
     <message>
         <source>Directory .opvault must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Тека .opvault мусить бути прочитною</translation>
     </message>
     <message>
         <source>Directory .opvault/default must exist</source>
-        <translation type="unfinished"/>
+        <translation>Тека .opvault/default мусить існувати</translation>
     </message>
     <message>
         <source>Directory .opvault/default must be readable</source>
-        <translation type="unfinished"/>
+        <translation>Тека .opvault/default мусить бути прочитною</translation>
     </message>
     <message>
         <source>Unable to decode masterKey: %1</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо розшифрувати головний ключ: %1</translation>
     </message>
     <message>
         <source>Unable to derive master key: %1</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо вивести головний ключ: %1</translation>
     </message>
 </context>
 <context>
     <name>OpenSSHKey</name>
     <message>
         <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation>Хибний файл ключа. Ключ має бути у форматі OpenSSH</translation>
+        <translation>Хибний файловий ключ. Ключ має бути у форматі OpenSSH</translation>
     </message>
     <message>
         <source>PEM boundary mismatch</source>
@@ -4845,11 +4858,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Key file way too small.</source>
-        <translation>Файл ключа занадто маленький.</translation>
+        <translation>Файловий ключ занадто короткий.</translation>
     </message>
     <message>
         <source>Key file magic header id invalid</source>
-        <translation>Хибний логічний код файлу ключа</translation>
+        <translation>Хибний логічний код файлового ключа</translation>
     </message>
     <message>
         <source>Found zero keys</source>
@@ -4861,7 +4874,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
-        <translation>Файл ключа пошкоджений, зчитування таємного ключа зазнало невдачі</translation>
+        <translation>Файловий ключ пошкоджений, зчитування таємного ключа зазнало невдачі</translation>
     </message>
     <message>
         <source>No private key payload to decrypt</source>
@@ -4932,11 +4945,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <name>PasswordEdit</name>
     <message>
         <source>Passwords do not match</source>
-        <translation type="unfinished"/>
+        <translation>Паролі не співпадають</translation>
     </message>
     <message>
         <source>Passwords match so far</source>
-        <translation type="unfinished"/>
+        <translation>Паролі поки що співпадають</translation>
     </message>
 </context>
 <context>
@@ -4975,11 +4988,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Repeat password field</source>
-        <translation type="unfinished"/>
+        <translation>Поле повторення пароля</translation>
     </message>
     <message>
         <source>Toggle password generator</source>
-        <translation type="unfinished"/>
+        <translation>Перемкнути генератор паролів</translation>
     </message>
 </context>
 <context>
@@ -5183,47 +5196,47 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Generated password</source>
-        <translation type="unfinished"/>
+        <translation>Створений пароль</translation>
     </message>
     <message>
         <source>Upper-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Великі літери</translation>
     </message>
     <message>
         <source>Lower-case letters</source>
-        <translation type="unfinished"/>
+        <translation>Маленькі літери</translation>
     </message>
     <message>
         <source>Special characters</source>
-        <translation type="unfinished"/>
+        <translation>Спеціальні символи</translation>
     </message>
     <message>
         <source>Math Symbols</source>
-        <translation type="unfinished"/>
+        <translation>Математичні символи</translation>
     </message>
     <message>
         <source>Dashes and Slashes</source>
-        <translation type="unfinished"/>
+        <translation>Риски</translation>
     </message>
     <message>
         <source>Excluded characters</source>
-        <translation type="unfinished"/>
+        <translation>Виключені символи</translation>
     </message>
     <message>
         <source>Hex Passwords</source>
-        <translation type="unfinished"/>
+        <translation>Шістнадцяткові паролі</translation>
     </message>
     <message>
         <source>Password length</source>
-        <translation type="unfinished"/>
+        <translation>Довжина пароля</translation>
     </message>
     <message>
         <source>Word Case:</source>
-        <translation type="unfinished"/>
+        <translation>Регістр слів:</translation>
     </message>
     <message>
         <source>Regenerate password</source>
-        <translation type="unfinished"/>
+        <translation>Створити пароль знову</translation>
     </message>
     <message>
         <source>Copy password</source>
@@ -5231,19 +5244,19 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Accept password</source>
-        <translation type="unfinished"/>
+        <translation>Прийняти пароль</translation>
     </message>
     <message>
         <source>lower case</source>
-        <translation type="unfinished"/>
+        <translation>нижній регістр</translation>
     </message>
     <message>
         <source>UPPER CASE</source>
-        <translation type="unfinished"/>
+        <translation>ВЕРХНІЙ РЕГІСТР</translation>
     </message>
     <message>
         <source>Title Case</source>
-        <translation type="unfinished"/>
+        <translation>З заголовної літери</translation>
     </message>
     <message>
         <source>Toggle password visibility</source>
@@ -5297,7 +5310,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"/>
+        <translation>Продовжити</translation>
     </message>
 </context>
 <context>
@@ -5360,7 +5373,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Key file of the database.</source>
-        <translation>Файл ключа для сховища.</translation>
+        <translation>Файловий ключ для сховища.</translation>
     </message>
     <message>
         <source>path</source>
@@ -5444,10 +5457,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation>Попередження: Ви використовуєте застарілий формат ключа, підтримка якого
+        <translation>Попередження: Ви використовуєте застарілий формат файлового ключа, підтримка якого
  може незабаром закінчитись.
 
- Бажано створити новий файл-ключ.</translation>
+Бажано створити новий файловий ключ.</translation>
     </message>
     <message>
         <source>
@@ -5493,7 +5506,7 @@ Available commands:
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
-        <translation>Файл ключа для сховища, яке підлягає об&apos;єднанню.</translation>
+        <translation>Файловий ключ для сховища, яке підлягає об&apos;єднанню.</translation>
     </message>
     <message>
         <source>Show an entry&apos;s information.</source>
@@ -5501,11 +5514,11 @@ Available commands:
     </message>
     <message>
         <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
-        <translation>Назви атрибутів для показу. Цей параметр можна вказати кілька разів, тим часом у кожному рядку може бути тільки один примірник у заданому порядку. Якщо атрибути не вказані, буде показано типові атрибути.</translation>
+        <translation>Назви ознак для показу. Цей параметр можна вказати кілька разів, тим часом у кожному рядку може бути тільки один примірник у заданому порядку. Якщо ознаки не вказані, буде показано типові ознаки.</translation>
     </message>
     <message>
         <source>attribute</source>
-        <translation>атрибут</translation>
+        <translation>ознака</translation>
     </message>
     <message>
         <source>Name of the entry to show.</source>
@@ -5768,7 +5781,7 @@ Available commands:
     </message>
     <message>
         <source>Failed to load key file %1: %2</source>
-        <translation>Завантаження файла ключа зазнало невдачі %1: %2</translation>
+        <translation>Завантаження файлового ключа зазнало невдачі %1: %2</translation>
     </message>
     <message>
         <source>Length of the generated password</source>
@@ -5842,7 +5855,7 @@ Available commands:
     </message>
     <message>
         <source>ERROR: unknown attribute %1.</source>
-        <translation>ПОМИЛКА: невідомий атрибут %1.</translation>
+        <translation>ПОМИЛКА: невідома ознака %1.</translation>
     </message>
     <message>
         <source>No program defined for clipboard manipulation</source>
@@ -5912,7 +5925,7 @@ Available commands:
     </message>
     <message>
         <source>Loading the key file failed</source>
-        <translation>Завантаження ключа зазнало невдачі</translation>
+        <translation>Завантаження файлового ключа зазнало невдачі</translation>
     </message>
     <message>
         <source>No key is set. Aborting database creation.</source>
@@ -5960,7 +5973,7 @@ Available commands:
     </message>
     <message>
         <source>key file of the database</source>
-        <translation>файл-ключ сховища</translation>
+        <translation>файловий ключ сховища</translation>
     </message>
     <message>
         <source>read password of the database from stdin</source>
@@ -5992,15 +6005,15 @@ Available commands:
     </message>
     <message>
         <source>Deactivate password key for the database.</source>
-        <translation type="unfinished"/>
+        <translation>Вимкнути парольний ключ для сховища.</translation>
     </message>
     <message>
         <source>Displays debugging information.</source>
-        <translation type="unfinished"/>
+        <translation>Показаує інформацію щодо зневадження.</translation>
     </message>
     <message>
         <source>Deactivate password key for the database to merge from.</source>
-        <translation type="unfinished"/>
+        <translation>Вимкнути парольний ключ для сховища, яке підлягає об&apos;єднанню.</translation>
     </message>
     <message>
         <source>Version %1</source>
@@ -6020,11 +6033,11 @@ Available commands:
     </message>
     <message>
         <source>Debugging mode is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Режим зневадження вимкнено.</translation>
     </message>
     <message>
         <source>Debugging mode is enabled.</source>
-        <translation type="unfinished"/>
+        <translation>Режим зневадження ввімкнено.</translation>
     </message>
     <message>
         <source>Operating system: %1
@@ -6068,151 +6081,151 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Cryptographic libraries:</source>
-        <translation type="unfinished"/>
+        <translation>Шифрувальні бібліотеки:</translation>
     </message>
     <message>
         <source>Cannot generate a password and prompt at the same time!</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо створити пароль і запросити його водночасно!</translation>
     </message>
     <message>
         <source>Adds a new group to a database.</source>
-        <translation type="unfinished"/>
+        <translation>Додає нову групу для сховища.</translation>
     </message>
     <message>
         <source>Path of the group to add.</source>
-        <translation type="unfinished"/>
+        <translation>Шлях до групи, яку треба додати.</translation>
     </message>
     <message>
         <source>Group %1 already exists!</source>
-        <translation type="unfinished"/>
+        <translation>Група %1 вже існує!</translation>
     </message>
     <message>
         <source>Group %1 not found.</source>
-        <translation type="unfinished"/>
+        <translation>Групу %1 не знайдено.</translation>
     </message>
     <message>
         <source>Successfully added group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Успішно додано групу %1.</translation>
     </message>
     <message>
         <source>Check if any passwords have been publicly leaked. FILENAME must be the path of a file listing SHA-1 hashes of leaked passwords in HIBP format, as available from https://haveibeenpwned.com/Passwords.</source>
-        <translation type="unfinished"/>
+        <translation>Перевіряє, чи стали якісь паролі відомими. ІМ&apos;Я ФАЙЛУ має бути шляхом до файлу, який містить контрольні суми SHA-1 відомих паролів у форматі HIBP. Такий файл можна завантажити, наприклад, з https://haveibeenpwned.com/Passwords .</translation>
     </message>
     <message>
         <source>FILENAME</source>
-        <translation type="unfinished"/>
+        <translation>ІМʼЯ ФАЙЛУ</translation>
     </message>
     <message>
         <source>Analyze passwords for weaknesses and problems.</source>
-        <translation type="unfinished"/>
+        <translation>Проаналізувати паролі на слабкість та інші проблеми.</translation>
     </message>
     <message>
         <source>Failed to open HIBP file %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося відкрити файл HIBP %1: %2</translation>
     </message>
     <message>
         <source>Evaluating database entries against HIBP file, this will take a while...</source>
-        <translation type="unfinished"/>
+        <translation>Звіряння записів сховища з файлом HIBP, це може тривате досить довго...</translation>
     </message>
     <message>
         <source>Close the currently opened database.</source>
-        <translation type="unfinished"/>
+        <translation>Закрити наразі відкрите сховище.</translation>
     </message>
     <message>
         <source>Display this help.</source>
-        <translation type="unfinished"/>
+        <translation>Показати цю довідку.</translation>
     </message>
     <message>
         <source>Yubikey slot used to encrypt the database.</source>
-        <translation type="unfinished"/>
+        <translation>Гніздо Yubikey для шифрування сховища.</translation>
     </message>
     <message>
         <source>slot</source>
-        <translation type="unfinished"/>
+        <translation>гніздо</translation>
     </message>
     <message>
         <source>Invalid word count %1</source>
-        <translation type="unfinished"/>
+        <translation>Хибна кількість слів %1</translation>
     </message>
     <message>
         <source>The word list is too small (&lt; 1000 items)</source>
-        <translation type="unfinished"/>
+        <translation>Список слів надто малий (&lt; 1000 одиниць)</translation>
     </message>
     <message>
         <source>Exit interactive mode.</source>
-        <translation type="unfinished"/>
+        <translation>Вийти з діалогового режиму.</translation>
     </message>
     <message>
         <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
-        <translation type="unfinished"/>
+        <translation>Формат для експорту. Можливі формати: xml або csv. Типовий формат — xml.</translation>
     </message>
     <message>
         <source>Exports the content of a database to standard output in the specified format.</source>
-        <translation type="unfinished"/>
+        <translation>Надсилає вміст сховища до стандартного виходу в зазначеному форматі.</translation>
     </message>
     <message>
         <source>Unable to export database to XML: %1</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо експортувати сховище в XML: %1</translation>
     </message>
     <message>
         <source>Unsupported format %1</source>
-        <translation type="unfinished"/>
+        <translation>Непідтримуваний формат %1</translation>
     </message>
     <message>
         <source>Use numbers</source>
-        <translation type="unfinished"/>
+        <translation>Використовувати цифри</translation>
     </message>
     <message>
         <source>Invalid password length %1</source>
-        <translation type="unfinished"/>
+        <translation>Хибна довжина пароля %1</translation>
     </message>
     <message>
         <source>Display command help.</source>
-        <translation type="unfinished"/>
+        <translation>Показати довідку щодо команд.</translation>
     </message>
     <message>
         <source>Available commands:</source>
-        <translation type="unfinished"/>
+        <translation>Доступні команди:</translation>
     </message>
     <message>
         <source>Import the contents of an XML database.</source>
-        <translation type="unfinished"/>
+        <translation>Імпортувати вміст сховища XML.</translation>
     </message>
     <message>
         <source>Path of the XML database export.</source>
-        <translation type="unfinished"/>
+        <translation>Шлях для експорту сховища XML.</translation>
     </message>
     <message>
         <source>Path of the new database.</source>
-        <translation type="unfinished"/>
+        <translation>Шлях до нового сховища.</translation>
     </message>
     <message>
         <source>Unable to import XML database export %1</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо імпортувати експортоване сховище XML %1</translation>
     </message>
     <message>
         <source>Successfully imported database.</source>
-        <translation type="unfinished"/>
+        <translation>Сховище вдало імпортоване.</translation>
     </message>
     <message>
         <source>Unknown command %1</source>
-        <translation type="unfinished"/>
+        <translation>Невідома команда %1</translation>
     </message>
     <message>
         <source>Flattens the output to single lines.</source>
-        <translation type="unfinished"/>
+        <translation>Сплощує вивід до єдиного рядка.</translation>
     </message>
     <message>
         <source>Only print the changes detected by the merge operation.</source>
-        <translation type="unfinished"/>
+        <translation>Друкує лише зміни, знайдені під час об&apos;єднання.</translation>
     </message>
     <message>
         <source>Yubikey slot for the second database.</source>
-        <translation type="unfinished"/>
+        <translation>Гніздо Yubikey для другого сховища.</translation>
     </message>
     <message>
         <source>Successfully merged %1 into %2.</source>
-        <translation type="unfinished"/>
+        <translation>%1 успішно об́&apos;єднано з %2.</translation>
     </message>
     <message>
         <source>Database was not modified by merge operation.</source>
@@ -6220,103 +6233,103 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Moves an entry to a new group.</source>
-        <translation type="unfinished"/>
+        <translation>Переміщує запис до нової групи.</translation>
     </message>
     <message>
         <source>Path of the entry to move.</source>
-        <translation type="unfinished"/>
+        <translation>Шлях до запису, що підлягає переміщенню.</translation>
     </message>
     <message>
         <source>Path of the destination group.</source>
-        <translation type="unfinished"/>
+        <translation>Шлях до групи призначення.</translation>
     </message>
     <message>
         <source>Could not find group with path %1.</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо знайти групу за шляхом %1.</translation>
     </message>
     <message>
         <source>Entry is already in group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Запис вже в групі %1.</translation>
     </message>
     <message>
         <source>Successfully moved entry %1 to group %2.</source>
-        <translation type="unfinished"/>
+        <translation>Запис %1 успішно переміщено до групи %2.</translation>
     </message>
     <message>
         <source>Open a database.</source>
-        <translation type="unfinished"/>
+        <translation>Відкрити сховище.</translation>
     </message>
     <message>
         <source>Path of the group to remove.</source>
-        <translation type="unfinished"/>
+        <translation>Шлях до групи, що підлягає видаленню.</translation>
     </message>
     <message>
         <source>Cannot remove root group from database.</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо видалити кореневу групу зі сховища.</translation>
     </message>
     <message>
         <source>Successfully recycled group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Успішно перероблено групу %1.</translation>
     </message>
     <message>
         <source>Successfully deleted group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Групу %1 успішно вилучено.</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not found</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося відкрити файл сховища %1: файл не знайдено</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not a plain file</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося відкрити файл сховища %1: не звичайний файл</translation>
     </message>
     <message>
         <source>Failed to open database file %1: not readable</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося відкрити файл сховища %1: недоступний для читання</translation>
     </message>
     <message>
         <source>Enter password to unlock %1: </source>
-        <translation type="unfinished"/>
+        <translation>Введіть пароль для розблокування %1: </translation>
     </message>
     <message>
         <source>Invalid YubiKey slot %1</source>
-        <translation type="unfinished"/>
+        <translation>Хибне гніздо YubiKey %1</translation>
     </message>
     <message>
         <source>Please touch the button on your YubiKey to unlock %1</source>
-        <translation type="unfinished"/>
+        <translation>Натисніть, будь ласка, кнопку YubiKey для розблокування %1</translation>
     </message>
     <message>
         <source>Enter password to encrypt database (optional): </source>
-        <translation type="unfinished"/>
+        <translation>Введіть пароль для шифрування сховища (необов&apos;язково): </translation>
     </message>
     <message>
         <source>HIBP file, line %1: parse error</source>
-        <translation type="unfinished"/>
+        <translation>Файл HIBP, рядок %1: помилка синтаксичного аналізу</translation>
     </message>
     <message>
         <source>Secret Service Integration</source>
-        <translation type="unfinished"/>
+        <translation>Сполучення з Таємною службою</translation>
     </message>
     <message>
         <source>User name</source>
-        <translation type="unfinished"/>
+        <translation>Ім’я користувача</translation>
     </message>
     <message>
         <source>%1[%2] Challenge Response - Slot %3 - %4</source>
-        <translation type="unfinished"/>
+        <translation>%1[%2] виклик відповідь — гніздо %3 — %4</translation>
     </message>
     <message numerus="yes">
         <source>Password for &apos;%1&apos; has been leaked %2 time(s)!</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Пароль для «%1» став відомим у %2 випадку!</numerusform><numerusform>Пароль для «%1» став відомим у %2 випадках!</numerusform><numerusform>Пароль для «%1» став відомим у %2 випадках!</numerusform><numerusform>Пароль для «%1» став відомим у %2 випадках!</numerusform></translation>
     </message>
     <message>
         <source>Invalid password generator after applying all options</source>
-        <translation type="unfinished"/>
+        <translation>Після застосування всіх параметрів генератор паролів став непридатним</translation>
     </message>
     <message>
         <source>Show the protected attributes in clear text.</source>
-        <translation type="unfinished"/>
+        <translation>Показувати захищені ознаки незахищеним текстом.</translation>
     </message>
 </context>
 <context>
@@ -6475,11 +6488,11 @@ Kernel: %3 %4</source>
     <name>SettingsWidgetFdoSecrets</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"/>
+        <translation>Параметри</translation>
     </message>
     <message>
         <source>Enable KeepassXC Freedesktop.org Secret Service integration</source>
-        <translation type="unfinished"/>
+        <translation>Увімкнути сполучення KeePassXC з Таємною службою Freedesktop.org</translation>
     </message>
     <message>
         <source>General</source>
@@ -6487,23 +6500,23 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Show notification when credentials are requested</source>
-        <translation type="unfinished"/>
+        <translation>Показувати повідомлення, коли надходить запит на реєстраційні дані</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Якщо смітник увімкнено для сховища, записи будуть переміщені у смітник, а не видалені. Інакше їх буде видалено без додаткового схвалення.&lt;/p&gt;&lt;p&gt;Ви одержуватими повідомлення тільки якщо існують посилання на записи, що Ви видаляєте.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation type="unfinished"/>
+        <translation>Не запитувати схвалення, коли інші клієнти видаляють записи.</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
-        <translation type="unfinished"/>
+        <translation>Виставлені групи сховища:</translation>
     </message>
     <message>
         <source>File Name</source>
-        <translation type="unfinished"/>
+        <translation>Ім&apos;я файлу</translation>
     </message>
     <message>
         <source>Group</source>
@@ -6511,23 +6524,23 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Manage</source>
-        <translation type="unfinished"/>
+        <translation>Керувати</translation>
     </message>
     <message>
         <source>Authorization</source>
-        <translation type="unfinished"/>
+        <translation>Дозвіл</translation>
     </message>
     <message>
         <source>These applications are currently connected:</source>
-        <translation type="unfinished"/>
+        <translation>Такі застосунки зараз сполучені:</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished"/>
+        <translation>Застосунок</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"/>
+        <translation>Від&apos;єднати</translation>
     </message>
     <message>
         <source>Database settings</source>
@@ -6535,7 +6548,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Edit database settings</source>
-        <translation type="unfinished"/>
+        <translation>Змінити налаштування сховища</translation>
     </message>
     <message>
         <source>Unlock database</source>
@@ -6543,7 +6556,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Unlock database to show more information</source>
-        <translation type="unfinished"/>
+        <translation>Розблокуйте сховище, щоб показати додаткову інформацію</translation>
     </message>
     <message>
         <source>Lock database</source>
@@ -6551,7 +6564,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Unlock to show</source>
-        <translation type="unfinished"/>
+        <translation>Розблокуйте для показу</translation>
     </message>
     <message>
         <source>None</source>
@@ -6659,7 +6672,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>KeeShare key file</source>
-        <translation>Файл ключа KeeShare</translation>
+        <translation>Файловий ключ KeeShare</translation>
     </message>
     <message>
         <source>All files</source>
@@ -6683,15 +6696,15 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Allow KeeShare imports</source>
-        <translation type="unfinished"/>
+        <translation>Дозволити імпорт KeeShare</translation>
     </message>
     <message>
         <source>Allow KeeShare exports</source>
-        <translation type="unfinished"/>
+        <translation>Дозволити експорт KeeShare</translation>
     </message>
     <message>
         <source>Only show warnings and errors</source>
-        <translation type="unfinished"/>
+        <translation>Показувати лише попередження і помилки</translation>
     </message>
     <message>
         <source>Key</source>
@@ -6699,39 +6712,39 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Signer name field</source>
-        <translation type="unfinished"/>
+        <translation>Поле імені підписувача</translation>
     </message>
     <message>
         <source>Generate new certificate</source>
-        <translation type="unfinished"/>
+        <translation>Створити новий сертифікат</translation>
     </message>
     <message>
         <source>Import existing certificate</source>
-        <translation type="unfinished"/>
+        <translation>Імпортувати наявний сертифікат</translation>
     </message>
     <message>
         <source>Export own certificate</source>
-        <translation type="unfinished"/>
+        <translation>Експортувати власний сертифікат</translation>
     </message>
     <message>
         <source>Known shares</source>
-        <translation type="unfinished"/>
+        <translation>Відоме спільне використання</translation>
     </message>
     <message>
         <source>Trust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Довіряти вибраним сертифікатам</translation>
     </message>
     <message>
         <source>Ask whether to trust the selected certificate every time</source>
-        <translation type="unfinished"/>
+        <translation>Запитувати кожного разу, чи довіряти вибраному сертифікатові</translation>
     </message>
     <message>
         <source>Untrust selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Скасувати довіру вибраним сертифікатам</translation>
     </message>
     <message>
         <source>Remove selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Видалити вибраний сертифікат</translation>
     </message>
 </context>
 <context>
@@ -6959,15 +6972,15 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Secret Key:</source>
-        <translation type="unfinished"/>
+        <translation>Таємний ключ:</translation>
     </message>
     <message>
         <source>Secret key must be in Base32 format</source>
-        <translation type="unfinished"/>
+        <translation>Таємний ключ мусить бути в форматі Base32</translation>
     </message>
     <message>
         <source>Secret key field</source>
-        <translation type="unfinished"/>
+        <translation>Поле таємного ключа</translation>
     </message>
     <message>
         <source>Algorithm:</source>
@@ -6975,28 +6988,28 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Time step field</source>
-        <translation type="unfinished"/>
+        <translation>Поле кроку часу</translation>
     </message>
     <message>
         <source> digits</source>
-        <translation type="unfinished"/>
+        <translation> цифр</translation>
     </message>
     <message>
         <source>Invalid TOTP Secret</source>
-        <translation type="unfinished"/>
+        <translation>Хибний таємний ТОП</translation>
     </message>
     <message>
         <source>You have entered an invalid secret key. The key must be in Base32 format.
 Example: JBSWY3DPEHPK3PXP</source>
-        <translation type="unfinished"/>
+        <translation>Ви ввели хибний таємний ключ. Ключ мусить бути в форматі Base32. Наприклад: JBSWY3DPEHPK3PXP</translation>
     </message>
     <message>
         <source>Confirm Remove TOTP Settings</source>
-        <translation type="unfinished"/>
+        <translation>Схвалити видалення параметрів ТОП</translation>
     </message>
     <message>
         <source>Are you sure you want to delete TOTP settings for this entry?</source>
-        <translation type="unfinished"/>
+        <translation>Ви дійсно хочете видалити налаштування ТОП для цього запису?</translation>
     </message>
 </context>
 <context>
@@ -7082,11 +7095,11 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Імпортувати з 1Password</translation>
     </message>
     <message>
         <source>Open a recent database</source>
-        <translation type="unfinished"/>
+        <translation>Відкрити недавнє сховище</translation>
     </message>
 </context>
 <context>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f438f689be..2c22418f2c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.5.1
+version: 2.5.2
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e3bca7af8..af9b9bb586 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,6 +121,7 @@ set(keepassx_SOURCES
         gui/TotpDialog.cpp
         gui/TotpExportSettingsDialog.cpp
         gui/DatabaseOpenDialog.cpp
+        gui/URLEdit.cpp
         gui/WelcomeWidget.cpp
         gui/csvImport/CsvImportWidget.cpp
         gui/csvImport/CsvImportWizard.cpp
diff --git a/src/browser/BrowserAction.cpp b/src/browser/BrowserAction.cpp
index 20b2fc975f..fec5b985a8 100644
--- a/src/browser/BrowserAction.cpp
+++ b/src/browser/BrowserAction.cpp
@@ -42,7 +42,7 @@ QJsonObject BrowserAction::readResponse(const QJsonObject& json)
 
     bool triggerUnlock = false;
     const QString trigger = json.value("triggerUnlock").toString();
-    if (!trigger.isEmpty() && trigger.compare("true", Qt::CaseSensitive) == 0) {
+    if (!trigger.isEmpty() && trigger.compare(TRUE_STR, Qt::CaseSensitive) == 0) {
         triggerUnlock = true;
     }
 
@@ -268,7 +268,7 @@ QJsonObject BrowserAction::handleGetLogins(const QJsonObject& json, const QStrin
     const QString id = decrypted.value("id").toString();
     const QString submit = decrypted.value("submitUrl").toString();
     const QString auth = decrypted.value("httpAuth").toString();
-    const bool httpAuth = auth.compare("true", Qt::CaseSensitive) == 0 ? true : false;
+    const bool httpAuth = auth.compare(TRUE_STR, Qt::CaseSensitive) == 0 ? true : false;
     const QJsonArray users = m_browserService.findMatchingEntries(id, url, submit, "", keyList, httpAuth);
 
     if (users.isEmpty()) {
@@ -469,7 +469,7 @@ QJsonObject BrowserAction::buildMessage(const QString& nonce) const
 {
     QJsonObject message;
     message["version"] = KEEPASSXC_VERSION;
-    message["success"] = "true";
+    message["success"] = TRUE_STR;
     message["nonce"] = nonce;
     return message;
 }
diff --git a/src/browser/BrowserOptionDialog.cpp b/src/browser/BrowserOptionDialog.cpp
index a5bb921da5..1af989e00d 100644
--- a/src/browser/BrowserOptionDialog.cpp
+++ b/src/browser/BrowserOptionDialog.cpp
@@ -68,6 +68,10 @@ BrowserOptionDialog::BrowserOptionDialog(QWidget* parent)
     connect(m_ui->useCustomProxy, SIGNAL(toggled(bool)), m_ui->customProxyLocationBrowseButton, SLOT(setEnabled(bool)));
     connect(m_ui->customProxyLocationBrowseButton, SIGNAL(clicked()), this, SLOT(showProxyLocationFileDialog()));
 
+#ifndef Q_OS_LINUX
+    m_ui->snapWarningLabel->setVisible(false);
+#endif
+
 #ifdef Q_OS_WIN
     // Brave uses Chrome's registry settings
     m_ui->braveSupport->setHidden(true);
@@ -124,6 +128,9 @@ void BrowserOptionDialog::loadSettings()
     m_ui->vivaldiSupport->setChecked(settings->vivaldiSupport());
     m_ui->torBrowserSupport->setChecked(settings->torBrowserSupport());
 #endif
+#ifndef Q_OS_LINUX
+    m_ui->snapWarningLabel->setVisible(false);
+#endif
 
 #if defined(KEEPASSXC_DIST_APPIMAGE)
     m_ui->supportBrowserProxy->setChecked(true);
diff --git a/src/browser/BrowserOptionDialog.ui b/src/browser/BrowserOptionDialog.ui
index 638c400aa3..84fc5bdbf6 100755
--- a/src/browser/BrowserOptionDialog.ui
+++ b/src/browser/BrowserOptionDialog.ui
@@ -60,7 +60,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label">
+        <widget class="QLabel" name="snapWarningLabel">
          <property name="text">
           <string>Browsers installed as snaps are currently not supported.</string>
          </property>
diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 392d28c438..63860b58da 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -54,6 +54,7 @@ static const QString KEEPASSHTTP_GROUP_NAME = QStringLiteral("KeePassHttp Passwo
 // Extra entry related options saved in custom data
 const QString BrowserService::OPTION_SKIP_AUTO_SUBMIT = QStringLiteral("BrowserSkipAutoSubmit");
 const QString BrowserService::OPTION_HIDE_ENTRY = QStringLiteral("BrowserHideEntry");
+const QString BrowserService::OPTION_ONLY_HTTP_AUTH = QStringLiteral("BrowserOnlyHttpAuth");
 // Multiple URL's
 const QString BrowserService::ADDITIONAL_URL = QStringLiteral("KP2A_URL");
 
@@ -380,9 +381,14 @@ QJsonArray BrowserService::findMatchingEntries(const QString& id,
     // Check entries for authorization
     QList<Entry*> pwEntriesToConfirm;
     QList<Entry*> pwEntries;
-    for (auto* entry : searchEntries(url, keyList)) {
+    for (auto* entry : searchEntries(url, submitUrl, keyList)) {
         if (entry->customData()->contains(BrowserService::OPTION_HIDE_ENTRY)
-            && entry->customData()->value(BrowserService::OPTION_HIDE_ENTRY) == "true") {
+            && entry->customData()->value(BrowserService::OPTION_HIDE_ENTRY) == TRUE_STR) {
+            continue;
+        }
+
+        if (!httpAuth && entry->customData()->contains(BrowserService::OPTION_ONLY_HTTP_AUTH)
+            && entry->customData()->value(BrowserService::OPTION_ONLY_HTTP_AUTH) == TRUE_STR) {
             continue;
         }
 
@@ -583,7 +589,7 @@ BrowserService::ReturnValue BrowserService::updateEntry(const QString& id,
 }
 
 QList<Entry*>
-BrowserService::searchEntries(const QSharedPointer<Database>& db, const QString& hostname, const QString& url)
+BrowserService::searchEntries(const QSharedPointer<Database>& db, const QString& url, const QString& submitUrl)
 {
     QList<Entry*> entries;
     auto* rootGroup = db->rootGroup();
@@ -601,20 +607,15 @@ BrowserService::searchEntries(const QSharedPointer<Database>& db, const QString&
                 continue;
             }
 
-            auto domain = baseDomain(hostname);
-
             // Search for additional URL's starting with KP2A_URL
-            if (entry->attributes()->keys().contains(ADDITIONAL_URL)) {
-                for (const auto& key : entry->attributes()->keys()) {
-                    if (key.startsWith(ADDITIONAL_URL)
-                        && handleURL(entry->attributes()->value(key), domain, url)) {
-                        entries.append(entry);
-                        continue;
-                    }
+            for (const auto& key : entry->attributes()->keys()) {
+                if (key.startsWith(ADDITIONAL_URL) && handleURL(entry->attributes()->value(key), url, submitUrl)) {
+                    entries.append(entry);
+                    continue;
                 }
             }
 
-            if (!handleURL(entry->url(), domain, url)) {
+            if (!handleURL(entry->url(), url, submitUrl)) {
                 continue;
             }
 
@@ -625,7 +626,7 @@ BrowserService::searchEntries(const QSharedPointer<Database>& db, const QString&
     return entries;
 }
 
-QList<Entry*> BrowserService::searchEntries(const QString& url, const StringPairList& keyList)
+QList<Entry*> BrowserService::searchEntries(const QString& url, const QString& submitUrl, const StringPairList& keyList)
 {
     // Check if database is connected with KeePassXC-Browser
     auto databaseConnected = [&](const QSharedPointer<Database>& db) {
@@ -662,7 +663,7 @@ QList<Entry*> BrowserService::searchEntries(const QString& url, const StringPair
     QList<Entry*> entries;
     do {
         for (const auto& db : databases) {
-            entries << searchEntries(db, hostname, url);
+            entries << searchEntries(db, url, submitUrl);
         }
     } while (entries.isEmpty() && removeFirstDomain(hostname));
 
@@ -855,7 +856,7 @@ QJsonObject BrowserService::prepareEntry(const Entry* entry)
     }
 
     if (entry->isExpired()) {
-        res["expired"] = "true";
+        res["expired"] = TRUE_STR;
     }
 
     if (entry->customData()->contains(BrowserService::OPTION_SKIP_AUTO_SUBMIT)) {
@@ -1000,7 +1001,7 @@ bool BrowserService::removeFirstDomain(QString& hostname)
     return false;
 }
 
-bool BrowserService::handleURL(const QString& entryUrl, const QString& hostname, const QString& url)
+bool BrowserService::handleURL(const QString& entryUrl, const QString& url, const QString& submitUrl)
 {
     if (entryUrl.isEmpty()) {
         return false;
@@ -1017,31 +1018,36 @@ bool BrowserService::handleURL(const QString& entryUrl, const QString& hostname,
         }
     }
 
+    // Make a direct compare if a local file is used
+    if (url.contains("file://")) {
+        return entryUrl == submitUrl;
+    }
+
     // URL host validation fails
-    if (browserSettings()->matchUrlScheme() && entryQUrl.host().isEmpty()) {
+    if (entryQUrl.host().isEmpty()) {
         return false;
     }
 
     // Match port, if used
-    QUrl qUrl(url);
-    if (entryQUrl.port() > 0 && entryQUrl.port() != qUrl.port()) {
+    QUrl siteQUrl(url);
+    if (entryQUrl.port() > 0 && entryQUrl.port() != siteQUrl.port()) {
         return false;
     }
 
     // Match scheme
-    if (browserSettings()->matchUrlScheme() && !entryQUrl.scheme().isEmpty() && entryQUrl.scheme().compare(qUrl.scheme()) != 0) {
+    if (browserSettings()->matchUrlScheme() && !entryQUrl.scheme().isEmpty()
+        && entryQUrl.scheme().compare(siteQUrl.scheme()) != 0) {
         return false;
     }
 
     // Check for illegal characters
     QRegularExpression re("[<>\\^`{|}]");
-    auto match = re.match(entryUrl);
-    if (match.hasMatch()) {
+    if (re.match(entryUrl).hasMatch()) {
         return false;
     }
 
     // Filter to match hostname in URL field
-    if (entryQUrl.host().endsWith(hostname)) {
+    if (siteQUrl.host().endsWith(entryQUrl.host())) {
         return true;
     }
 
diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
index cb20ecbfb7..495c9ac258 100644
--- a/src/browser/BrowserService.h
+++ b/src/browser/BrowserService.h
@@ -63,8 +63,8 @@ class BrowserService : public QObject
                   const QString& group,
                   const QString& groupUuid,
                   const QSharedPointer<Database>& selectedDb = {});
-    QList<Entry*> searchEntries(const QSharedPointer<Database>& db, const QString& hostname, const QString& url);
-    QList<Entry*> searchEntries(const QString& url, const StringPairList& keyList);
+    QList<Entry*> searchEntries(const QSharedPointer<Database>& db, const QString& url, const QString& submitUrl);
+    QList<Entry*> searchEntries(const QString& url, const QString& submitUrl, const StringPairList& keyList);
     void convertAttributesToCustomData(const QSharedPointer<Database>& currentDb = {});
 
 public:
@@ -74,6 +74,7 @@ class BrowserService : public QObject
     static const QString LEGACY_ASSOCIATE_KEY_PREFIX;
     static const QString OPTION_SKIP_AUTO_SUBMIT;
     static const QString OPTION_HIDE_ENTRY;
+    static const QString OPTION_ONLY_HTTP_AUTH;
     static const QString ADDITIONAL_URL;
 
 public slots:
@@ -130,7 +131,7 @@ public slots:
     sortPriority(const Entry* entry, const QString& host, const QString& submitUrl, const QString& baseSubmitUrl) const;
     bool schemeFound(const QString& url);
     bool removeFirstDomain(QString& hostname);
-    bool handleURL(const QString& entryUrl, const QString& hostname, const QString& url);
+    bool handleURL(const QString& entryUrl, const QString& url, const QString& submitUrl);
     QString baseDomain(const QString& hostname) const;
     QSharedPointer<Database> getDatabase();
     QSharedPointer<Database> selectedDatabase();
diff --git a/src/cli/Analyze.cpp b/src/cli/Analyze.cpp
index 3e6edcebfb..6095e988b3 100644
--- a/src/cli/Analyze.cpp
+++ b/src/cli/Analyze.cpp
@@ -55,7 +55,7 @@ int Analyze::executeWithDatabase(QSharedPointer<Database> database, QSharedPoint
         return EXIT_FAILURE;
     }
 
-    outputTextStream << QObject::tr("Evaluating database entries against HIBP file, this will take a while...");
+    outputTextStream << QObject::tr("Evaluating database entries against HIBP file, this will take a while...") << endl;
 
     QList<QPair<const Entry*, int>> findings;
     QString error;
diff --git a/src/cli/Merge.cpp b/src/cli/Merge.cpp
index f02794a4bb..5855eff469 100644
--- a/src/cli/Merge.cpp
+++ b/src/cli/Merge.cpp
@@ -30,8 +30,7 @@ const QCommandLineOption Merge::SameCredentialsOption =
                        QObject::tr("Use the same credentials for both database files."));
 
 const QCommandLineOption Merge::KeyFileFromOption =
-    QCommandLineOption(QStringList() << "k"
-                                     << "key-file-from",
+    QCommandLineOption(QStringList() << "key-file-from",
                        QObject::tr("Key file of the database to merge from."),
                        QObject::tr("path"));
 
diff --git a/src/cli/keepassxc-cli.cpp b/src/cli/keepassxc-cli.cpp
index e16be9b296..179b79a435 100644
--- a/src/cli/keepassxc-cli.cpp
+++ b/src/cli/keepassxc-cli.cpp
@@ -149,7 +149,7 @@ void enterInteractiveMode(const QStringList& arguments)
         prompt += "> ";
         command = reader->readLine(prompt);
         if (reader->isFinished()) {
-            return;
+            break;
         }
 
         QStringList args = Utils::splitCommandString(command);
@@ -162,13 +162,17 @@ void enterInteractiveMode(const QStringList& arguments)
             errorTextStream << QObject::tr("Unknown command %1").arg(args[0]) << "\n";
             continue;
         } else if (cmd->name == "quit" || cmd->name == "exit") {
-            return;
+            break;
         }
 
         cmd->currentDatabase = currentDatabase;
         cmd->execute(args);
         currentDatabase = cmd->currentDatabase;
     }
+
+    if (currentDatabase) {
+        currentDatabase->releaseData();
+    }
 }
 
 int main(int argc, char** argv)
diff --git a/src/core/Bootstrap.cpp b/src/core/Bootstrap.cpp
index 204942f4de..46aff92d58 100644
--- a/src/core/Bootstrap.cpp
+++ b/src/core/Bootstrap.cpp
@@ -106,7 +106,11 @@ namespace Bootstrap
     {
         // start minimized if configured
         if (config()->get("GUI/MinimizeOnStartup").toBool()) {
+#ifdef Q_OS_WIN
             mainWindow.showMinimized();
+#else
+            mainWindow.hideWindow();
+#endif
         } else {
             mainWindow.bringToFront();
         }
diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 4cccd6d534..066abc4e31 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -42,7 +42,6 @@ Database::Database()
     : m_metadata(new Metadata(this))
     , m_data()
     , m_rootGroup(nullptr)
-    , m_timer(new QTimer(this))
     , m_fileWatcher(new FileWatcher(this))
     , m_emitModified(false)
     , m_uuid(QUuid::createUuid())
@@ -50,12 +49,12 @@ Database::Database()
     setRootGroup(new Group());
     rootGroup()->setUuid(QUuid::createUuid());
     rootGroup()->setName(tr("Root", "Root group name"));
-    m_timer->setSingleShot(true);
+    m_modifiedTimer.setSingleShot(true);
 
     s_uuidMap.insert(m_uuid, this);
 
     connect(m_metadata, SIGNAL(metadataModified()), SLOT(markAsModified()));
-    connect(m_timer, SIGNAL(timeout()), SIGNAL(databaseModified()));
+    connect(&m_modifiedTimer, SIGNAL(timeout()), SIGNAL(databaseModified()));
     connect(this, SIGNAL(databaseOpened()), SLOT(updateCommonUsernames()));
     connect(this, SIGNAL(databaseSaved()), SLOT(updateCommonUsernames()));
     connect(m_fileWatcher, SIGNAL(fileChanged()), SIGNAL(databaseFileChanged()));
@@ -229,6 +228,7 @@ bool Database::saveAs(const QString& filePath, QString* error, bool atomic, bool
     auto& canonicalFilePath = QFileInfo::exists(filePath) ? QFileInfo(filePath).canonicalFilePath() : filePath;
     bool ok = performSave(canonicalFilePath, error, atomic, backup);
     if (ok) {
+        markAsClean();
         setFilePath(filePath);
         m_fileWatcher->start(canonicalFilePath, 30, 1);
     } else {
@@ -343,7 +343,6 @@ bool Database::writeDatabase(QIODevice* device, QString* error)
         return false;
     }
 
-    markAsClean();
     return true;
 }
 
@@ -832,7 +831,7 @@ void Database::emptyRecycleBin()
 void Database::setEmitModified(bool value)
 {
     if (m_emitModified && !value) {
-        m_timer->stop();
+        m_modifiedTimer.stop();
     }
 
     m_emitModified = value;
@@ -846,8 +845,9 @@ bool Database::isModified() const
 void Database::markAsModified()
 {
     m_modified = true;
-    if (m_emitModified) {
-        startModifiedTimer();
+    if (m_emitModified && !m_modifiedTimer.isActive()) {
+        // Small time delay prevents numerous consecutive saves due to repeated signals
+        m_modifiedTimer.start(150);
     }
 }
 
@@ -855,6 +855,7 @@ void Database::markAsClean()
 {
     bool emitSignal = m_modified;
     m_modified = false;
+    m_modifiedTimer.stop();
     if (emitSignal) {
         emit databaseSaved();
     }
@@ -869,18 +870,6 @@ Database* Database::databaseByUuid(const QUuid& uuid)
     return s_uuidMap.value(uuid, nullptr);
 }
 
-void Database::startModifiedTimer()
-{
-    if (!m_emitModified) {
-        return;
-    }
-
-    if (m_timer->isActive()) {
-        m_timer->stop();
-    }
-    m_timer->start(150);
-}
-
 QSharedPointer<const CompositeKey> Database::key() const
 {
     return m_data.key;
diff --git a/src/core/Database.h b/src/core/Database.h
index 9c99299459..d3d88e7d2e 100644
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -21,23 +21,22 @@
 
 #include <QDateTime>
 #include <QHash>
-#include <QObject>
 #include <QPointer>
 #include <QScopedPointer>
+#include <QTimer>
 
 #include "config-keepassx.h"
 #include "crypto/kdf/AesKdf.h"
 #include "crypto/kdf/Kdf.h"
 #include "format/KeePass2.h"
-#include "keys/PasswordKey.h"
 #include "keys/CompositeKey.h"
+#include "keys/PasswordKey.h"
 
 class Entry;
 enum class EntryReferenceType;
 class FileWatcher;
 class Group;
 class Metadata;
-class QTimer;
 class QIODevice;
 
 struct DeletedObject
@@ -155,9 +154,6 @@ public slots:
     void databaseDiscarded();
     void databaseFileChanged();
 
-private slots:
-    void startModifiedTimer();
-
 private:
     struct DatabaseData
     {
@@ -211,7 +207,7 @@ private slots:
     DatabaseData m_data;
     QPointer<Group> m_rootGroup;
     QList<DeletedObject> m_deletedObjects;
-    QPointer<QTimer> m_timer;
+    QTimer m_modifiedTimer;
     QPointer<FileWatcher> m_fileWatcher;
     bool m_initialized = false;
     bool m_modified = false;
diff --git a/src/core/FileWatcher.cpp b/src/core/FileWatcher.cpp
index 0d1def31ae..fb8e951280 100644
--- a/src/core/FileWatcher.cpp
+++ b/src/core/FileWatcher.cpp
@@ -35,11 +35,10 @@ namespace
 
 FileWatcher::FileWatcher(QObject* parent)
     : QObject(parent)
-    , m_ignoreFileChange(false)
 {
-    connect(&m_fileWatcher, SIGNAL(fileChanged(QString)), SLOT(onWatchedFileChanged()));
+    connect(&m_fileWatcher, SIGNAL(fileChanged(QString)), SLOT(checkFileChanged()));
+    connect(&m_fileChecksumTimer, SIGNAL(timeout()), SLOT(checkFileChanged()));
     connect(&m_fileChangeDelayTimer, SIGNAL(timeout()), SIGNAL(fileChanged()));
-    connect(&m_fileChecksumTimer, SIGNAL(timeout()), SLOT(checkFileChecksum()));
     m_fileChangeDelayTimer.setSingleShot(true);
     m_fileIgnoreDelayTimer.setSingleShot(true);
 }
@@ -101,17 +100,6 @@ void FileWatcher::resume()
     }
 }
 
-void FileWatcher::onWatchedFileChanged()
-{
-    // Don't notify if we are ignoring events or already started a notification chain
-    if (shouldIgnoreChanges()) {
-        return;
-    }
-
-    m_fileChecksum = calculateChecksum();
-    m_fileChangeDelayTimer.start(0);
-}
-
 bool FileWatcher::shouldIgnoreChanges()
 {
     return m_filePath.isEmpty() || m_ignoreFileChange || m_fileIgnoreDelayTimer.isActive()
@@ -123,15 +111,23 @@ bool FileWatcher::hasSameFileChecksum()
     return calculateChecksum() == m_fileChecksum;
 }
 
-void FileWatcher::checkFileChecksum()
+void FileWatcher::checkFileChanged()
 {
     if (shouldIgnoreChanges()) {
         return;
     }
 
-    if (!hasSameFileChecksum()) {
-        onWatchedFileChanged();
+    // Prevent reentrance
+    m_ignoreFileChange = true;
+
+    // Only trigger the change notice if there is a checksum mismatch
+    auto checksum = calculateChecksum();
+    if (checksum != m_fileChecksum) {
+        m_fileChecksum = checksum;
+        m_fileChangeDelayTimer.start(0);
     }
+
+    m_ignoreFileChange = false;
 }
 
 QByteArray FileWatcher::calculateChecksum()
diff --git a/src/core/FileWatcher.h b/src/core/FileWatcher.h
index fea05fc84b..9b55badc16 100644
--- a/src/core/FileWatcher.h
+++ b/src/core/FileWatcher.h
@@ -43,8 +43,7 @@ public slots:
     void resume();
 
 private slots:
-    void onWatchedFileChanged();
-    void checkFileChecksum();
+    void checkFileChanged();
 
 private:
     QByteArray calculateChecksum();
@@ -56,8 +55,8 @@ private slots:
     QTimer m_fileChangeDelayTimer;
     QTimer m_fileIgnoreDelayTimer;
     QTimer m_fileChecksumTimer;
-    int m_fileChecksumSizeBytes;
-    bool m_ignoreFileChange;
+    int m_fileChecksumSizeBytes = -1;
+    bool m_ignoreFileChange = false;
 };
 
 class BulkFileWatcher : public QObject
diff --git a/src/core/Global.h b/src/core/Global.h
index 9ebe787902..0821687e36 100644
--- a/src/core/Global.h
+++ b/src/core/Global.h
@@ -20,6 +20,7 @@
 #ifndef KEEPASSX_GLOBAL_H
 #define KEEPASSX_GLOBAL_H
 
+#include <QString>
 #include <QtGlobal>
 
 #if defined(Q_OS_WIN)
@@ -42,6 +43,9 @@
 #define FILE_CASE_SENSITIVE Qt::CaseSensitive
 #endif
 
+static const auto TRUE_STR = QStringLiteral("true");
+static const auto FALSE_STR = QStringLiteral("false");
+
 template <typename T> struct AddConst
 {
     typedef const T Type;
diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
index 2dbf0093d6..7cfc8a55f3 100644
--- a/src/core/Tools.cpp
+++ b/src/core/Tools.cpp
@@ -32,6 +32,7 @@
 #include <QRegularExpression>
 #include <QStringList>
 #include <QSysInfo>
+#include <QUrl>
 #include <QUuid>
 #include <cctype>
 
@@ -259,6 +260,33 @@ namespace Tools
         }
     }
 
+    bool checkUrlValid(const QString& urlField)
+    {
+        if (urlField.isEmpty()) {
+            return true;
+        }
+
+        QUrl url;
+        if (urlField.contains("://")) {
+            url = urlField;
+        } else {
+            url = QUrl::fromUserInput(urlField);
+        }
+
+        if (url.scheme() != "file" && url.host().isEmpty()) {
+            return false;
+        }
+
+        // Check for illegal characters. Adds also the wildcard * to the list
+        QRegularExpression re("[<>\\^`{|}\\*]");
+        auto match = re.match(urlField);
+        if (match.hasMatch()) {
+            return false;
+        }
+
+        return true;
+    }
+
     // Escape common regex symbols except for *, ?, and |
     auto regexEscape = QRegularExpression(R"re(([-[\]{}()+.,\\\/^$#]))re");
 
diff --git a/src/core/Tools.h b/src/core/Tools.h
index 1fa5e6a9ad..455b879c25 100644
--- a/src/core/Tools.h
+++ b/src/core/Tools.h
@@ -41,6 +41,7 @@ namespace Tools
     bool isBase64(const QByteArray& ba);
     void sleep(int ms);
     void wait(int ms);
+    bool checkUrlValid(const QString& urlField);
     QString uuidToHex(const QUuid& uuid);
     QUuid hexToUuid(const QString& uuid);
     QRegularExpression convertToRegex(const QString& string,
diff --git a/src/fdosecrets/CMakeLists.txt b/src/fdosecrets/CMakeLists.txt
index 9d3fcb6a92..a9750bc2d2 100644
--- a/src/fdosecrets/CMakeLists.txt
+++ b/src/fdosecrets/CMakeLists.txt
@@ -4,6 +4,7 @@ if(WITH_XC_FDOSECRETS)
     add_library(fdosecrets STATIC
         # app settings page
         FdoSecretsPlugin.cpp
+        widgets/SettingsModels.cpp
         widgets/SettingsWidgetFdoSecrets.cpp
 
         # per database settings page
diff --git a/src/fdosecrets/FdoSecretsPlugin.cpp b/src/fdosecrets/FdoSecretsPlugin.cpp
index 668b5fb046..646f853018 100644
--- a/src/fdosecrets/FdoSecretsPlugin.cpp
+++ b/src/fdosecrets/FdoSecretsPlugin.cpp
@@ -60,11 +60,15 @@ void FdoSecretsPlugin::updateServiceState()
             });
             if (!m_secretService->initialize()) {
                 m_secretService.reset();
+                FdoSecrets::settings()->setEnabled(false);
+                return;
             }
+            emit secretServiceStarted();
         }
     } else {
         if (m_secretService) {
             m_secretService.reset();
+            emit secretServiceStopped();
         }
     }
 }
@@ -74,6 +78,11 @@ Service* FdoSecretsPlugin::serviceInstance() const
     return m_secretService.data();
 }
 
+DatabaseTabWidget* FdoSecretsPlugin::dbTabs() const
+{
+    return m_dbTabs;
+}
+
 void FdoSecretsPlugin::emitRequestSwitchToDatabases()
 {
     emit requestSwitchToDatabases();
diff --git a/src/fdosecrets/FdoSecretsPlugin.h b/src/fdosecrets/FdoSecretsPlugin.h
index 2a57ea0db3..828c0bd764 100644
--- a/src/fdosecrets/FdoSecretsPlugin.h
+++ b/src/fdosecrets/FdoSecretsPlugin.h
@@ -59,6 +59,11 @@ class FdoSecretsPlugin : public QObject, public ISettingsPage
      */
     FdoSecrets::Service* serviceInstance() const;
 
+    /**
+     * @return The db tabs widget, containing opened databases. Can be nullptr.
+     */
+    DatabaseTabWidget* dbTabs() const;
+
 public slots:
     void emitRequestSwitchToDatabases();
     void emitRequestShowNotification(const QString& msg, const QString& title = {});
@@ -67,6 +72,8 @@ public slots:
     void error(const QString& msg);
     void requestSwitchToDatabases();
     void requestShowNotification(const QString& msg, const QString& title, int msTimeoutHint);
+    void secretServiceStarted();
+    void secretServiceStopped();
 
 private:
     QPointer<DatabaseTabWidget> m_dbTabs;
diff --git a/src/fdosecrets/objects/Collection.cpp b/src/fdosecrets/objects/Collection.cpp
index c826c1db06..c2fb29a08a 100644
--- a/src/fdosecrets/objects/Collection.cpp
+++ b/src/fdosecrets/objects/Collection.cpp
@@ -21,6 +21,7 @@
 #include "fdosecrets/objects/Item.h"
 #include "fdosecrets/objects/Prompt.h"
 #include "fdosecrets/objects/Service.h"
+#include "fdosecrets/objects/Session.h"
 
 #include "core/Config.h"
 #include "core/Database.h"
@@ -29,6 +30,7 @@
 #include "gui/DatabaseWidget.h"
 
 #include <QFileInfo>
+#include <QRegularExpression>
 
 namespace FdoSecrets
 {
@@ -47,6 +49,14 @@ namespace FdoSecrets
         connect(backend, &DatabaseWidget::databaseUnlocked, this, &Collection::onDatabaseLockChanged);
         connect(backend, &DatabaseWidget::databaseLocked, this, &Collection::onDatabaseLockChanged);
 
+        // get notified whenever unlock db dialog finishes
+        connect(parent, &Service::doneUnlockDatabaseInDialog, this, [this](bool accepted, DatabaseWidget* dbWidget) {
+            if (!dbWidget || dbWidget != m_backend) {
+                return;
+            }
+            emit doneUnlockCollection(accepted);
+        });
+
         reloadBackend();
     }
 
@@ -241,6 +251,11 @@ namespace FdoSecrets
             terms << attributeToTerm(it.key(), it.value());
         }
 
+        // empty terms causes EntrySearcher returns everything
+        if (terms.isEmpty()) {
+            return QList<Item*>{};
+        }
+
         QList<Item*> items;
         const auto foundEntries = EntrySearcher().search(terms, m_exposedGroup);
         items.reserve(foundEntries.size());
@@ -267,7 +282,7 @@ namespace FdoSecrets
         const auto useWildcards = false;
         const auto exactMatch = true;
         const auto caseSensitive = true;
-        term.regex = Tools::convertToRegex(value, useWildcards, exactMatch, caseSensitive);
+        term.regex = Tools::convertToRegex(QRegularExpression::escape(value), useWildcards, exactMatch, caseSensitive);
 
         return term;
     }
@@ -284,8 +299,13 @@ namespace FdoSecrets
             return ret;
         }
 
+        if (!pathToObject<Session>(secret.session)) {
+            return DBusReturn<>::Error(QStringLiteral(DBUS_ERROR_SECRET_NO_SESSION));
+        }
+
         prompt = nullptr;
 
+        bool newlyCreated = true;
         Item* item = nullptr;
         QString itemPath;
         StringStringMap attributes;
@@ -303,6 +323,7 @@ namespace FdoSecrets
             }
             if (!existings.value().isEmpty() && replace) {
                 item = existings.value().front();
+                newlyCreated = false;
             }
         }
 
@@ -328,15 +349,25 @@ namespace FdoSecrets
 
             // when creation finishes in backend, we will already have item
             item = m_entryToItem.value(entry, nullptr);
-            Q_ASSERT(item);
+
+            if (!item) {
+                // may happen if entry somehow ends up in recycle bin
+                return DBusReturn<>::Error(QStringLiteral(DBUS_ERROR_SECRET_NO_SUCH_OBJECT));
+            }
         }
 
         ret = item->setProperties(properties);
         if (ret.isError()) {
+            if (newlyCreated) {
+                item->doDelete();
+            }
             return ret;
         }
         ret = item->setSecret(secret);
         if (ret.isError()) {
+            if (newlyCreated) {
+                item->doDelete();
+            }
             return ret;
         }
 
@@ -439,7 +470,7 @@ namespace FdoSecrets
 
         auto newUuid = FdoSecrets::settings()->exposedGroup(m_backend->database());
         auto newGroup = m_backend->database()->rootGroup()->findGroupByUuid(newUuid);
-        if (!newGroup) {
+        if (!newGroup || inRecycleBin(newGroup)) {
             // no exposed group, delete self
             doDelete();
             return;
@@ -451,14 +482,20 @@ namespace FdoSecrets
         m_exposedGroup = newGroup;
 
         // Attach signal to update exposed group settings if the group was removed.
-        // The lifetime of the connection is bound to the database object, because
-        // in Database::~Database, groups are also deleted, but we don't want to
-        // trigger this.
-        // This rely on the fact that QObject disconnects signals BEFORE deleting
-        // children.
+        //
+        // When the group object is normally deleted due to ~Database, the databaseReplaced
+        // signal should be first emitted, and we will clean up connection in reloadDatabase,
+        // so this handler won't be triggered.
         QPointer<Database> db = m_backend->database().data();
-        connect(m_exposedGroup.data(), &Group::groupAboutToRemove, db, [db](Group* toBeRemoved) {
-            if (!db) {
+        connect(m_exposedGroup.data(), &Group::groupAboutToRemove, this, [this](Group* toBeRemoved) {
+            if (backendLocked()) {
+                return;
+            }
+            auto db = m_backend->database();
+            if (toBeRemoved->database() != db) {
+                // should not happen, but anyway.
+                // somehow our current database has been changed, and the old group is being deleted
+                // possibly logic changes in replaceDatabase.
                 return;
             }
             auto uuid = FdoSecrets::settings()->exposedGroup(db);
@@ -468,10 +505,17 @@ namespace FdoSecrets
                 FdoSecrets::settings()->setExposedGroup(db, {});
             }
         });
+        // Another possibility is the group being moved to recycle bin.
+        connect(m_exposedGroup.data(), &Group::groupModified, this, [this]() {
+            if (inRecycleBin(m_exposedGroup->parentGroup())) {
+                // reset the exposed group to none
+                FdoSecrets::settings()->setExposedGroup(m_backend->database().data(), {});
+            }
+        });
 
         // Monitor exposed group settings
         connect(m_backend->database()->metadata()->customData(), &CustomData::customDataModified, this, [this]() {
-            if (!m_exposedGroup || !m_backend) {
+            if (!m_exposedGroup || backendLocked()) {
                 return;
             }
             if (m_exposedGroup->uuid() == FdoSecrets::settings()->exposedGroup(m_backend->database())) {
@@ -590,9 +634,13 @@ namespace FdoSecrets
 
     void Collection::cleanupConnections()
     {
+        m_backend->database()->metadata()->customData()->disconnect(this);
         if (m_exposedGroup) {
-            m_exposedGroup->disconnect(this);
+            for (const auto group : m_exposedGroup->groupsRecursive(true)) {
+                group->disconnect(this);
+            }
         }
+
         m_items.clear();
     }
 
@@ -646,17 +694,21 @@ namespace FdoSecrets
     {
         Q_ASSERT(m_backend);
 
-        if (!m_backend->database()->metadata()->recycleBin()) {
+        if (!group) {
+            // the root group's parent is nullptr, we treat it as not in recycle bin.
             return false;
         }
 
-        while (group) {
-            if (group->uuid() == m_backend->database()->metadata()->recycleBin()->uuid()) {
-                return true;
-            }
-            group = group->parentGroup();
+        if (!m_backend->database()->metadata()) {
+            return false;
         }
-        return false;
+
+        auto recycleBin = m_backend->database()->metadata()->recycleBin();
+        if (!recycleBin) {
+            return false;
+        }
+
+        return group->uuid() == recycleBin->uuid() || group->isRecycled();
     }
 
     bool Collection::inRecycleBin(Entry* entry) const
diff --git a/src/fdosecrets/objects/Collection.h b/src/fdosecrets/objects/Collection.h
index de9db3a494..0be8b42394 100644
--- a/src/fdosecrets/objects/Collection.h
+++ b/src/fdosecrets/objects/Collection.h
@@ -71,9 +71,16 @@ namespace FdoSecrets
         void aliasAdded(const QString& alias);
         void aliasRemoved(const QString& alias);
 
+        void doneUnlockCollection(bool accepted);
+
     public:
         DBusReturn<void> setProperties(const QVariantMap& properties);
 
+        bool isValid() const
+        {
+            return backend();
+        }
+
         DBusReturn<void> removeAlias(QString alias);
         DBusReturn<void> addAlias(QString alias);
         const QSet<QString> aliases() const;
@@ -106,6 +113,7 @@ namespace FdoSecrets
     private slots:
         void onDatabaseLockChanged();
         void onDatabaseExposedGroupChanged();
+        // force reload info from backend, potentially delete self
         void reloadBackend();
 
     private:
diff --git a/src/fdosecrets/objects/DBusReturn.h b/src/fdosecrets/objects/DBusReturn.h
index 6c94eab183..889b8e11c7 100644
--- a/src/fdosecrets/objects/DBusReturn.h
+++ b/src/fdosecrets/objects/DBusReturn.h
@@ -158,6 +158,12 @@ namespace FdoSecrets
             return std::move(m_value);
         }
 
+        /**
+         * Get value or handle the error by the passed in dbus object
+         * @tparam P
+         * @param p
+         * @return
+         */
         template <typename P> T valueOrHandle(P* p) const&
         {
             if (isError()) {
@@ -169,6 +175,12 @@ namespace FdoSecrets
             return m_value;
         }
 
+        /**
+         * Get value or handle the error by the passed in dbus object
+         * @tparam P
+         * @param p
+         * @return
+         */
         template <typename P> T&& valueOrHandle(P* p) &&
         {
             if (isError()) {
diff --git a/src/fdosecrets/objects/Prompt.cpp b/src/fdosecrets/objects/Prompt.cpp
index 14bc66b687..6a2458a4f7 100644
--- a/src/fdosecrets/objects/Prompt.cpp
+++ b/src/fdosecrets/objects/Prompt.cpp
@@ -93,9 +93,9 @@ namespace FdoSecrets
 
         MessageBox::OverrideParent override(findWindow(windowId));
         // only need to delete in backend, collection will react itself.
-        service()->doCloseDatabase(m_collection->backend());
+        auto accepted = service()->doCloseDatabase(m_collection->backend());
 
-        emit completed(false, {});
+        emit completed(!accepted, {});
 
         return {};
     }
@@ -189,19 +189,44 @@ namespace FdoSecrets
 
         MessageBox::OverrideParent override(findWindow(windowId));
 
-        QList<QDBusObjectPath> unlocked;
         for (const auto& c : asConst(m_collections)) {
             if (c) {
+                connect(c, &Collection::doneUnlockCollection, this, &UnlockCollectionsPrompt::collectionUnlockFinished);
                 c->doUnlock();
-                unlocked << c->objectPath();
             }
         }
 
-        emit completed(false, QVariant::fromValue(unlocked));
-
         return {};
     }
 
+    void UnlockCollectionsPrompt::collectionUnlockFinished(bool accepted)
+    {
+        auto coll = qobject_cast<Collection*>(sender());
+        if (!coll) {
+            return;
+        }
+
+        if (!m_collections.contains(coll)) {
+            // should not happen
+            coll->disconnect(this);
+            return;
+        }
+
+        // one shot
+        coll->disconnect(this);
+
+        if (accepted) {
+            m_unlocked << coll->objectPath();
+        } else {
+            m_numRejected += 1;
+        }
+
+        // if we've get all
+        if (m_numRejected + m_unlocked.size() == m_collections.size()) {
+            emit completed(m_unlocked.isEmpty(), QVariant::fromValue(m_unlocked));
+        }
+    }
+
     DeleteItemPrompt::DeleteItemPrompt(Service* parent, Item* item)
         : PromptBase(parent)
         , m_item(item)
diff --git a/src/fdosecrets/objects/Prompt.h b/src/fdosecrets/objects/Prompt.h
index 2d13084f6e..fee1cb9fbb 100644
--- a/src/fdosecrets/objects/Prompt.h
+++ b/src/fdosecrets/objects/Prompt.h
@@ -98,8 +98,13 @@ namespace FdoSecrets
 
         DBusReturn<void> prompt(const QString& windowId) override;
 
+    private slots:
+        void collectionUnlockFinished(bool accepted);
+
     private:
         QList<QPointer<Collection>> m_collections;
+        QList<QDBusObjectPath> m_unlocked;
+        int m_numRejected = 0;
     };
 
     class Item;
diff --git a/src/fdosecrets/objects/Service.cpp b/src/fdosecrets/objects/Service.cpp
index 6bca1f12c6..5408f4cb29 100644
--- a/src/fdosecrets/objects/Service.cpp
+++ b/src/fdosecrets/objects/Service.cpp
@@ -47,7 +47,8 @@ namespace FdoSecrets
         , m_insdieEnsureDefaultAlias(false)
         , m_serviceWatcher(nullptr)
     {
-        registerWithPath(QStringLiteral(DBUS_PATH_SECRETS), new ServiceAdaptor(this));
+        connect(
+            m_databases, &DatabaseTabWidget::databaseUnlockDialogFinished, this, &Service::doneUnlockDatabaseInDialog);
     }
 
     Service::~Service()
@@ -64,6 +65,8 @@ namespace FdoSecrets
             return false;
         }
 
+        registerWithPath(QStringLiteral(DBUS_PATH_SECRETS), new ServiceAdaptor(this));
+
         // Connect to service unregistered signal
         m_serviceWatcher.reset(new QDBusServiceWatcher());
         connect(m_serviceWatcher.data(),
@@ -93,7 +96,24 @@ namespace FdoSecrets
 
     void Service::onDatabaseTabOpened(DatabaseWidget* dbWidget, bool emitSignal)
     {
+        // The Collection will monitor the database's exposed group.
+        // When the Collection finds that no exposed group, it will delete itself.
+        // Thus the service also needs to monitor it and recreate the collection if the user changes
+        // from no exposed to exposed something.
+        if (!dbWidget->isLocked()) {
+            monitorDatabaseExposedGroup(dbWidget);
+        }
+        connect(dbWidget, &DatabaseWidget::databaseUnlocked, this, [this, dbWidget]() {
+            monitorDatabaseExposedGroup(dbWidget);
+        });
+
         auto coll = new Collection(this, dbWidget);
+        // Creation may fail if the database is not exposed.
+        // This is okay, because we monitor the expose settings above
+        if (!coll->isValid()) {
+            coll->deleteLater();
+            return;
+        }
 
         m_collections << coll;
         m_dbToCollection[dbWidget] = coll;
@@ -127,15 +147,6 @@ namespace FdoSecrets
             emit collectionDeleted(coll);
         });
 
-        // a special case: the database changed from no expose to expose something.
-        // in this case, there is no collection out there monitoring it, so create a new collection
-        if (!dbWidget->isLocked()) {
-            monitorDatabaseExposedGroup(dbWidget);
-        }
-        connect(dbWidget, &DatabaseWidget::databaseUnlocked, this, [this, dbWidget]() {
-            monitorDatabaseExposedGroup(dbWidget);
-        });
-
         if (emitSignal) {
             emit collectionCreated(coll);
         }
@@ -438,9 +449,9 @@ namespace FdoSecrets
         return m_sessions;
     }
 
-    void Service::doCloseDatabase(DatabaseWidget* dbWidget)
+    bool Service::doCloseDatabase(DatabaseWidget* dbWidget)
     {
-        m_databases->closeDatabaseTab(dbWidget);
+        return m_databases->closeDatabaseTab(dbWidget);
     }
 
     Collection* Service::doNewDatabase()
@@ -463,11 +474,10 @@ namespace FdoSecrets
 
     void Service::doSwitchToChangeDatabaseSettings(DatabaseWidget* dbWidget)
     {
-        // switch selected to current
-        // unlock if needed
         if (dbWidget->isLocked()) {
-            m_databases->unlockDatabaseInDialog(dbWidget, DatabaseOpenDialog::Intent::None);
+            return;
         }
+        // switch selected to current
         m_databases->setCurrentWidget(dbWidget);
         m_databases->changeDatabaseSettings();
 
diff --git a/src/fdosecrets/objects/Service.h b/src/fdosecrets/objects/Service.h
index bfa8ea843a..5de48da1cd 100644
--- a/src/fdosecrets/objects/Service.h
+++ b/src/fdosecrets/objects/Service.h
@@ -88,6 +88,13 @@ namespace FdoSecrets
          */
         void error(const QString& msg);
 
+        /**
+         * Finish signal for async action doUnlockDatabaseInDialog
+         * @param accepted If false, the action is canceled by the user
+         * @param dbWidget The unlocked the dbWidget if succeed
+         */
+        void doneUnlockDatabaseInDialog(bool accepted, DatabaseWidget* dbWidget);
+
     public:
         /**
          * List of sessions
@@ -101,9 +108,14 @@ namespace FdoSecrets
         }
 
     public slots:
-        void doCloseDatabase(DatabaseWidget* dbWidget);
+        bool doCloseDatabase(DatabaseWidget* dbWidget);
         Collection* doNewDatabase();
         void doSwitchToChangeDatabaseSettings(DatabaseWidget* dbWidget);
+
+        /**
+         * Async, connect to signal doneUnlockDatabaseInDialog for finish notification
+         * @param dbWidget
+         */
         void doUnlockDatabaseInDialog(DatabaseWidget* dbWidget);
 
     private slots:
diff --git a/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp b/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp
index fadd015422..16a780de7e 100644
--- a/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp
+++ b/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp
@@ -85,7 +85,7 @@ class DatabaseSettingsWidgetFdoSecrets::GroupModelNoRecycle : public QSortFilter
         // can not call mapFromSource, which internally calls filterAcceptsRow
         auto group = groupFromSourceIndex(source_idx);
 
-        return group->uuid() != recycleBin->uuid();
+        return group && !group->isRecycled() && group->uuid() != recycleBin->uuid();
     }
 };
 
@@ -118,8 +118,13 @@ void DatabaseSettingsWidgetFdoSecrets::loadSettings(QSharedPointer<Database> db)
     m_model.reset(new GroupModelNoRecycle(m_db.data()));
     m_ui->selectGroup->setModel(m_model.data());
 
+    Group* recycleBin = nullptr;
+    if (m_db->metadata() && m_db->metadata()->recycleBin()) {
+        recycleBin = m_db->metadata()->recycleBin();
+    }
+
     auto group = m_db->rootGroup()->findGroupByUuid(FdoSecrets::settings()->exposedGroup(m_db));
-    if (!group) {
+    if (!group || group->isRecycled() || (recycleBin && group->uuid() == recycleBin->uuid())) {
         m_ui->radioDonotExpose->setChecked(true);
     } else {
         auto idx = m_model->indexFromGroup(group);
diff --git a/src/fdosecrets/widgets/SettingsModels.cpp b/src/fdosecrets/widgets/SettingsModels.cpp
new file mode 100644
index 0000000000..edcb275c8b
--- /dev/null
+++ b/src/fdosecrets/widgets/SettingsModels.cpp
@@ -0,0 +1,396 @@
+/*
+ *  Copyright (C) 2019 Aetf <aetf@unlimitedcodeworks.xyz>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "SettingsModels.h"
+
+#include "fdosecrets/FdoSecretsPlugin.h"
+#include "fdosecrets/FdoSecretsSettings.h"
+#include "fdosecrets/objects/Service.h"
+#include "fdosecrets/objects/Session.h"
+
+#include "core/Database.h"
+#include "core/DatabaseIcons.h"
+#include "core/FilePath.h"
+#include "gui/DatabaseTabWidget.h"
+#include "gui/DatabaseWidget.h"
+
+#include <QFileInfo>
+
+namespace FdoSecrets
+{
+
+    SettingsDatabaseModel::SettingsDatabaseModel(DatabaseTabWidget* dbTabs, QObject* parent)
+        : QAbstractTableModel(parent)
+        , m_dbTabs(nullptr)
+    {
+        setTabWidget(dbTabs);
+    }
+
+    void SettingsDatabaseModel::setTabWidget(DatabaseTabWidget* dbTabs)
+    {
+        auto old = m_dbTabs;
+        m_dbTabs = dbTabs;
+        if (old != m_dbTabs) {
+            populateModel();
+        }
+    }
+
+    int SettingsDatabaseModel::rowCount(const QModelIndex& parent) const
+    {
+        if (parent.isValid()) {
+            return 0;
+        }
+        return m_dbs.size();
+    }
+
+    int SettingsDatabaseModel::columnCount(const QModelIndex& parent) const
+    {
+        if (parent.isValid()) {
+            return 0;
+        }
+        return 3;
+    }
+
+    QVariant SettingsDatabaseModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (orientation != Qt::Horizontal) {
+            return {};
+        }
+
+        if (role != Qt::DisplayRole) {
+            return {};
+        }
+
+        switch (section) {
+        case 0:
+            return tr("File Name");
+        case 1:
+            return tr("Group");
+        case 2:
+            return tr("Manage");
+        default:
+            return {};
+        }
+    }
+
+    QVariant SettingsDatabaseModel::data(const QModelIndex& index, int role) const
+    {
+        if (!index.isValid()) {
+            return {};
+        }
+        const auto& dbWidget = m_dbs[index.row()];
+        if (!dbWidget) {
+            return {};
+        }
+
+        switch (index.column()) {
+        case 0:
+            return dataForName(dbWidget, role);
+        case 1:
+            return dataForExposedGroup(dbWidget, role);
+        case 2:
+            return dataForManage(dbWidget, role);
+        default:
+            return {};
+        }
+    }
+
+    QVariant SettingsDatabaseModel::dataForName(DatabaseWidget* db, int role) const
+    {
+        switch (role) {
+        case Qt::DisplayRole: {
+            QFileInfo fi(db->database()->filePath());
+            return fi.fileName();
+        }
+        case Qt::ToolTipRole:
+            return db->database()->filePath();
+        default:
+            return {};
+        }
+    }
+
+    QVariant SettingsDatabaseModel::dataForExposedGroup(DatabaseWidget* dbWidget, int role)
+    {
+        if (dbWidget->isLocked()) {
+            switch (role) {
+            case Qt::DisplayRole:
+                return tr("Unlock to show");
+            case Qt::DecorationRole:
+                return filePath()->icon(QStringLiteral("apps"), QStringLiteral("object-locked"), true);
+            case Qt::FontRole: {
+                QFont font;
+                font.setItalic(true);
+                return font;
+            }
+            default:
+                return {};
+            }
+        }
+        auto db = dbWidget->database();
+        auto group = db->rootGroup()->findGroupByUuid(FdoSecrets::settings()->exposedGroup(db));
+        if (group) {
+            switch (role) {
+            case Qt::DisplayRole:
+                return group->name();
+            case Qt::DecorationRole:
+                return group->isExpired() ? databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex)
+                                          : group->iconScaledPixmap();
+            case Qt::FontRole:
+                if (group->isExpired()) {
+                    QFont font;
+                    font.setStrikeOut(true);
+                    return font;
+                } else {
+                    return {};
+                }
+            default:
+                return {};
+            }
+        } else {
+            switch (role) {
+            case Qt::DisplayRole:
+                return tr("None");
+            case Qt::DecorationRole:
+                return filePath()->icon(QStringLiteral("apps"), QStringLiteral("paint-none"), true);
+            default:
+                return {};
+            }
+        }
+    }
+
+    QVariant SettingsDatabaseModel::dataForManage(DatabaseWidget* db, int role) const
+    {
+        switch (role) {
+        case Qt::EditRole:
+            return QVariant::fromValue(db);
+        default:
+            return {};
+        }
+    }
+
+    void SettingsDatabaseModel::populateModel()
+    {
+        beginResetModel();
+
+        m_dbs.clear();
+
+        if (m_dbTabs) {
+            // Add existing database tabs
+            for (int idx = 0; idx != m_dbTabs->count(); ++idx) {
+                auto dbWidget = m_dbTabs->databaseWidgetFromIndex(idx);
+                databaseAdded(dbWidget, false);
+            }
+            // connect signals
+            connect(m_dbTabs, &DatabaseTabWidget::databaseOpened, this, [this](DatabaseWidget* db) {
+                databaseAdded(db, true);
+            });
+            connect(m_dbTabs, &DatabaseTabWidget::databaseClosed, this, &SettingsDatabaseModel::databaseRemoved);
+        }
+
+        endResetModel();
+    }
+
+    void SettingsDatabaseModel::databaseAdded(DatabaseWidget* db, bool emitSignals)
+    {
+        int row = m_dbs.size();
+        if (emitSignals) {
+            beginInsertRows({}, row, row);
+        }
+
+        m_dbs.append(db);
+        connect(db, &DatabaseWidget::databaseLocked, this, [row, this]() {
+            emit dataChanged(index(row, 1), index(row, 2));
+        });
+        connect(db, &DatabaseWidget::databaseUnlocked, this, [row, this]() {
+            emit dataChanged(index(row, 1), index(row, 2));
+        });
+        connect(db, &DatabaseWidget::databaseModified, this, [row, this]() {
+            emit dataChanged(index(row, 0), index(row, 2));
+        });
+        connect(db, &DatabaseWidget::databaseFilePathChanged, this, [row, this]() {
+            emit dataChanged(index(row, 0), index(row, 2));
+        });
+
+        if (emitSignals) {
+            endInsertRows();
+        }
+    }
+
+    void SettingsDatabaseModel::databaseRemoved(const QString& filePath)
+    {
+        for (int i = 0; i != m_dbs.size(); i++) {
+            if (m_dbs[i] && m_dbs[i]->database()->filePath() == filePath) {
+                beginRemoveRows({}, i, i);
+
+                m_dbs[i]->disconnect(this);
+                m_dbs.removeAt(i);
+
+                endRemoveRows();
+                break;
+            }
+        }
+    }
+
+    SettingsSessionModel::SettingsSessionModel(FdoSecretsPlugin* plugin, QObject* parent)
+        : QAbstractTableModel(parent)
+        , m_service(nullptr)
+    {
+        setService(plugin->serviceInstance());
+        connect(plugin, &FdoSecretsPlugin::secretServiceStarted, this, [plugin, this]() {
+            setService(plugin->serviceInstance());
+        });
+        connect(plugin, &FdoSecretsPlugin::secretServiceStopped, this, [this]() { setService(nullptr); });
+    }
+
+    void SettingsSessionModel::setService(Service* service)
+    {
+        auto old = m_service;
+        m_service = service;
+        if (old != m_service) {
+            populateModel();
+        }
+    }
+
+    int SettingsSessionModel::rowCount(const QModelIndex& parent) const
+    {
+        if (parent.isValid()) {
+            return 0;
+        }
+        return m_sessions.size();
+    }
+
+    int SettingsSessionModel::columnCount(const QModelIndex& parent) const
+    {
+        if (parent.isValid()) {
+            return 0;
+        }
+        return 2;
+    }
+
+    QVariant SettingsSessionModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (orientation != Qt::Horizontal) {
+            return {};
+        }
+
+        if (role != Qt::DisplayRole) {
+            return {};
+        }
+
+        switch (section) {
+        case 0:
+            return tr("Application");
+        case 1:
+            return tr("Manage");
+        default:
+            return {};
+        }
+    }
+
+    QVariant SettingsSessionModel::data(const QModelIndex& index, int role) const
+    {
+        if (!index.isValid()) {
+            return {};
+        }
+        const auto& sess = m_sessions[index.row()];
+        if (!sess) {
+            return {};
+        }
+
+        switch (index.column()) {
+        case 0:
+            return dataForApplication(sess, role);
+        case 1:
+            return dataForManage(sess, role);
+        default:
+            return {};
+        }
+    }
+
+    QVariant SettingsSessionModel::dataForApplication(Session* sess, int role) const
+    {
+        switch (role) {
+        case Qt::DisplayRole:
+            return sess->peer();
+        default:
+            return {};
+        }
+    }
+
+    QVariant SettingsSessionModel::dataForManage(Session* sess, int role) const
+    {
+        switch (role) {
+        case Qt::EditRole: {
+            auto v = QVariant::fromValue(sess);
+            qDebug() << v << v.type() << v.userType();
+            return v;
+        }
+        default:
+            return {};
+        }
+    }
+
+    void SettingsSessionModel::populateModel()
+    {
+        beginResetModel();
+
+        m_sessions.clear();
+
+        if (m_service) {
+            // Add existing database tabs
+            for (const auto& sess : m_service->sessions()) {
+                sessionAdded(sess, false);
+            }
+
+            // connect signals
+            connect(m_service, &Service::sessionOpened, this, [this](Session* sess) { sessionAdded(sess, true); });
+            connect(m_service, &Service::sessionClosed, this, &SettingsSessionModel::sessionRemoved);
+        }
+
+        endResetModel();
+    }
+
+    void SettingsSessionModel::sessionAdded(Session* sess, bool emitSignals)
+    {
+        int row = m_sessions.size();
+        if (emitSignals) {
+            beginInsertRows({}, row, row);
+        }
+
+        m_sessions.append(sess);
+
+        if (emitSignals) {
+            endInsertRows();
+        }
+    }
+
+    void SettingsSessionModel::sessionRemoved(Session* sess)
+    {
+        for (int i = 0; i != m_sessions.size(); i++) {
+            if (m_sessions[i] == sess) {
+                beginRemoveRows({}, i, i);
+
+                m_sessions[i]->disconnect(this);
+                m_sessions.removeAt(i);
+
+                endRemoveRows();
+                break;
+            }
+        }
+    }
+
+} // namespace FdoSecrets
diff --git a/src/fdosecrets/widgets/SettingsModels.h b/src/fdosecrets/widgets/SettingsModels.h
new file mode 100644
index 0000000000..b07bb16374
--- /dev/null
+++ b/src/fdosecrets/widgets/SettingsModels.h
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (C) 2019 Aetf <aetf@unlimitedcodeworks.xyz>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSXC_FDOSECRETS_SETTINGSMODELS_H
+#define KEEPASSXC_FDOSECRETS_SETTINGSMODELS_H
+
+#include <QAbstractTableModel>
+#include <QPointer>
+
+class DatabaseTabWidget;
+class DatabaseWidget;
+class FdoSecretsPlugin;
+
+namespace FdoSecrets
+{
+    class SettingsDatabaseModel : public QAbstractTableModel
+    {
+        Q_OBJECT
+    public:
+        explicit SettingsDatabaseModel(DatabaseTabWidget* dbTabs, QObject* parent = nullptr);
+
+        void setTabWidget(DatabaseTabWidget* dbTabs);
+
+        int rowCount(const QModelIndex& parent) const override;
+        int columnCount(const QModelIndex& parent) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+
+    private:
+        QVariant dataForName(DatabaseWidget* db, int role) const;
+        static QVariant dataForExposedGroup(DatabaseWidget* db, int role);
+        QVariant dataForManage(DatabaseWidget* db, int role) const;
+
+    private slots:
+        void populateModel();
+        void databaseAdded(DatabaseWidget* db, bool emitSignals);
+        void databaseRemoved(const QString& filePath);
+
+    private:
+        // source
+        QPointer<DatabaseTabWidget> m_dbTabs;
+
+        // internal store
+        QList<QPointer<DatabaseWidget>> m_dbs;
+    };
+
+    class Service;
+    class Session;
+
+    class SettingsSessionModel : public QAbstractTableModel
+    {
+        Q_OBJECT
+    public:
+        explicit SettingsSessionModel(FdoSecretsPlugin* plugin, QObject* parent = nullptr);
+
+        int rowCount(const QModelIndex& parent) const override;
+        int columnCount(const QModelIndex& parent) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+
+    private:
+        void setService(Service* service);
+
+        QVariant dataForApplication(Session* sess, int role) const;
+        QVariant dataForManage(Session* sess, int role) const;
+
+    private slots:
+        void populateModel();
+        void sessionAdded(Session* sess, bool emitSignals);
+        void sessionRemoved(Session* sess);
+
+    private:
+        // source
+        QPointer<Service> m_service;
+
+        // internal copy, so we can emit with changed index
+        QList<Session*> m_sessions;
+    };
+
+} // namespace FdoSecrets
+
+#endif // KEEPASSXC_FDOSECRETS_SETTINGSMODELS_H
diff --git a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
index 920b603d99..59399cdec0 100644
--- a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
+++ b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
@@ -20,241 +20,273 @@
 
 #include "fdosecrets/FdoSecretsPlugin.h"
 #include "fdosecrets/FdoSecretsSettings.h"
-#include "fdosecrets/objects/Collection.h"
-#include "fdosecrets/objects/Prompt.h"
 #include "fdosecrets/objects/Session.h"
+#include "fdosecrets/widgets/SettingsModels.h"
 
-#include "core/DatabaseIcons.h"
 #include "core/FilePath.h"
 #include "gui/DatabaseWidget.h"
 
 #include <QAction>
-#include <QDebug>
-#include <QFileInfo>
 #include <QHeaderView>
-#include <QPushButton>
-#include <QTableWidget>
+#include <QItemEditorFactory>
+#include <QStyledItemDelegate>
 #include <QToolBar>
 #include <QVariant>
 
-using FdoSecrets::Collection;
-using FdoSecrets::Service;
 using FdoSecrets::Session;
+using FdoSecrets::SettingsDatabaseModel;
+using FdoSecrets::SettingsSessionModel;
 
-SettingsWidgetFdoSecrets::SettingsWidgetFdoSecrets(FdoSecretsPlugin* plugin, QWidget* parent)
-    : QWidget(parent)
-    , m_ui(new Ui::SettingsWidgetFdoSecrets())
-    , m_plugin(plugin)
+namespace
 {
-    m_ui->setupUi(this);
+    class ManageDatabase : public QToolBar
+    {
+        Q_OBJECT
+
+        Q_PROPERTY(DatabaseWidget* dbWidget READ dbWidget WRITE setDbWidget USER true)
+
+    public:
+        explicit ManageDatabase(FdoSecretsPlugin* plugin, QWidget* parent = nullptr)
+            : QToolBar(parent)
+            , m_plugin(plugin)
+        {
+            setFloatable(false);
+            setMovable(false);
+
+            // use a dummy widget to center the buttons
+            auto spacer = new QWidget(this);
+            spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+            spacer->setVisible(true);
+            addWidget(spacer);
+
+            // db settings
+            m_dbSettingsAct = new QAction(tr("Database settings"), this);
+            m_dbSettingsAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("document-edit")));
+            m_dbSettingsAct->setToolTip(tr("Edit database settings"));
+            m_dbSettingsAct->setEnabled(false);
+            connect(m_dbSettingsAct, &QAction::triggered, this, [this]() {
+                if (!m_dbWidget) {
+                    return;
+                }
+                auto db = m_dbWidget;
+                m_plugin->serviceInstance()->doSwitchToChangeDatabaseSettings(m_dbWidget);
+            });
+            addAction(m_dbSettingsAct);
+
+            // unlock/lock
+            m_lockAct = new QAction(tr("Unlock database"), this);
+            m_lockAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("object-locked"), false));
+            m_lockAct->setToolTip(tr("Unlock database to show more information"));
+            connect(m_lockAct, &QAction::triggered, this, [this]() {
+                if (!m_dbWidget) {
+                    return;
+                }
+                if (m_dbWidget->isLocked()) {
+                    m_plugin->serviceInstance()->doUnlockDatabaseInDialog(m_dbWidget);
+                } else {
+                    m_dbWidget->lock();
+                }
+            });
+
+            addAction(m_lockAct);
+
+            // use a dummy widget to center the buttons
+            spacer = new QWidget(this);
+            spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+            spacer->setVisible(true);
+            addWidget(spacer);
+        }
 
-    auto sessHeader = m_ui->tableSessions->horizontalHeader();
-    sessHeader->setSelectionMode(QAbstractItemView::NoSelection);
-    sessHeader->setSectionsClickable(false);
-    sessHeader->setSectionResizeMode(0, QHeaderView::Stretch); // application
-    sessHeader->setSectionResizeMode(1, QHeaderView::ResizeToContents); // disconnect button
+        DatabaseWidget* dbWidget() const
+        {
+            return m_dbWidget;
+        }
 
-    auto dbHeader = m_ui->tableDatabases->horizontalHeader();
-    dbHeader->setSelectionMode(QAbstractItemView::NoSelection);
-    dbHeader->setSectionsClickable(false);
-    dbHeader->setSectionResizeMode(0, QHeaderView::Stretch); // file name
-    dbHeader->setSectionResizeMode(1, QHeaderView::Stretch); // group
-    dbHeader->setSectionResizeMode(2, QHeaderView::ResizeToContents); // manage button
+        void setDbWidget(DatabaseWidget* dbWidget)
+        {
+            if (m_dbWidget == dbWidget) {
+                return;
+            }
 
-    m_ui->tabWidget->setEnabled(m_ui->enableFdoSecretService->isChecked());
-    connect(m_ui->enableFdoSecretService, &QCheckBox::toggled, m_ui->tabWidget, &QTabWidget::setEnabled);
-}
+            if (m_dbWidget) {
+                disconnect();
+            }
 
-SettingsWidgetFdoSecrets::~SettingsWidgetFdoSecrets() = default;
+            m_dbWidget = dbWidget;
 
-void SettingsWidgetFdoSecrets::populateSessions(bool enabled)
-{
-    m_ui->tableSessions->setRowCount(0);
+            reconnect();
+        }
 
-    auto service = m_plugin->serviceInstance();
-    if (!service || !enabled) {
-        return;
-    }
+    private:
+        void disconnect()
+        {
+            if (!m_dbWidget) {
+                return;
+            }
+            m_dbWidget->disconnect(this);
+        }
 
-    for (const auto& sess : service->sessions()) {
-        addSessionRow(sess);
-    }
-}
+        void reconnect()
+        {
+            if (!m_dbWidget) {
+                return;
+            }
+            connect(m_dbWidget, &DatabaseWidget::databaseLocked, this, [this]() {
+                m_lockAct->setText(tr("Unlock database"));
+                m_lockAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("object-locked"), false));
+                m_lockAct->setToolTip(tr("Unlock database to show more information"));
+                m_dbSettingsAct->setEnabled(false);
+            });
+            connect(m_dbWidget, &DatabaseWidget::databaseUnlocked, this, [this]() {
+                m_lockAct->setText(tr("Lock database"));
+                m_lockAct->setIcon(
+                    filePath()->icon(QStringLiteral("actions"), QStringLiteral("object-unlocked"), false));
+                m_lockAct->setToolTip(tr("Lock database"));
+                m_dbSettingsAct->setEnabled(true);
+            });
+        }
 
-void SettingsWidgetFdoSecrets::addSessionRow(Session* sess)
-{
-    auto row = m_ui->tableSessions->rowCount();
-    m_ui->tableSessions->insertRow(row);
+    private:
+        FdoSecretsPlugin* m_plugin = nullptr;
+        QPointer<DatabaseWidget> m_dbWidget = nullptr;
+        QAction* m_dbSettingsAct = nullptr;
+        QAction* m_lockAct = nullptr;
+    };
+
+    class ManageSession : public QToolBar
+    {
+        Q_OBJECT
+
+        Q_PROPERTY(Session* session READ session WRITE setSession USER true)
+
+    public:
+        explicit ManageSession(FdoSecretsPlugin*, QWidget* parent = nullptr)
+            : QToolBar(parent)
+        {
+            setFloatable(false);
+            setMovable(false);
+
+            // use a dummy widget to center the buttons
+            auto spacer = new QWidget(this);
+            spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+            spacer->setVisible(true);
+            addWidget(spacer);
+
+            m_disconnectAct = new QAction(tr("Disconnect"), this);
+            m_disconnectAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("dialog-close")));
+            m_disconnectAct->setToolTip(tr("Disconnect this application"));
+            connect(m_disconnectAct, &QAction::triggered, this, [this]() {
+                if (m_session) {
+                    m_session->close();
+                }
+            });
+            addAction(m_disconnectAct);
+
+            // use a dummy widget to center the buttons
+            spacer = new QWidget(this);
+            spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+            spacer->setVisible(true);
+            addWidget(spacer);
+        }
 
-    // column 0: application name
-    auto item = new QTableWidgetItem(sess->peer());
-    item->setData(Qt::UserRole, QVariant::fromValue(sess));
-    m_ui->tableSessions->setItem(row, 0, item);
+        Session* session()
+        {
+            return m_session;
+        }
 
-    // column 1: disconnect button
-    auto btn = new QPushButton(tr("Disconnect"));
-    connect(btn, &QPushButton::clicked, sess, &Session::close);
-    m_ui->tableSessions->setCellWidget(row, 1, btn);
+        void setSession(Session* sess)
+        {
+            m_session = sess;
+        }
 
-    // column 2: hidden uuid
-    m_ui->tableSessions->setItem(row, 2, new QTableWidgetItem(sess->id()));
-}
+    private:
+        Session* m_session = nullptr;
+        QAction* m_disconnectAct = nullptr;
+    };
+
+    template <typename T> class Creator : public QItemEditorCreatorBase
+    {
+    public:
+        inline explicit Creator(FdoSecretsPlugin* plugin)
+            : QItemEditorCreatorBase()
+            , m_plugin(plugin)
+            , m_propertyName(T::staticMetaObject.userProperty().name())
+        {
+        }
 
-void SettingsWidgetFdoSecrets::removeSessionRow(Session* sess)
-{
-    int row = 0;
-    while (row != m_ui->tableSessions->rowCount()) {
-        auto item = m_ui->tableSessions->item(row, 0);
-        const auto itemSess = item->data(Qt::UserRole).value<Session*>();
-        if (itemSess == sess) {
-            break;
+        inline QWidget* createWidget(QWidget* parent) const override
+        {
+            return new T(m_plugin, parent);
         }
-        ++row;
-    }
-    if (row == m_ui->tableSessions->rowCount()) {
-        qWarning() << "Unknown Fdo Secret Service session" << sess->id() << "while removing collection from table";
-        return;
-    }
-
-    m_ui->tableSessions->removeRow(row);
-}
 
-void SettingsWidgetFdoSecrets::populateDatabases(bool enabled)
-{
-    m_ui->tableDatabases->setRowCount(0);
-
-    auto service = m_plugin->serviceInstance();
-    if (!service || !enabled) {
-        return;
-    }
-
-    auto ret = service->collections();
-    if (ret.isError()) {
-        return;
-    }
-    for (const auto& coll : ret.value()) {
-        addDatabaseRow(coll);
-    }
-}
+        inline QByteArray valuePropertyName() const override
+        {
+            return m_propertyName;
+        }
 
-void SettingsWidgetFdoSecrets::addDatabaseRow(Collection* coll)
-{
-    auto row = m_ui->tableDatabases->rowCount();
-    m_ui->tableDatabases->insertRow(row);
-
-    // column 0: File name
-    QFileInfo fi(coll->backend()->database()->filePath());
-    auto item = new QTableWidgetItem(fi.fileName());
-    item->setData(Qt::UserRole, QVariant::fromValue(coll));
-    m_ui->tableDatabases->setItem(row, 0, item);
-
-    // column 2: manage button: hboxlayout: unlock/lock settings
-    // create this first so we have a widget to bind connection to,
-    // which can then be auto deleted when the row is deleted.
-    auto widget = createManageButtons(coll);
-    m_ui->tableDatabases->setCellWidget(row, 2, widget);
-
-    // column 1: Group name
-    auto itemGroupName = new QTableWidgetItem();
-    updateExposedGroupItem(itemGroupName, coll);
-
-    connect(coll, &Collection::collectionLockChanged, widget, [this, itemGroupName, coll](bool) {
-        updateExposedGroupItem(itemGroupName, coll);
-    });
-
-    m_ui->tableDatabases->setItem(row, 1, itemGroupName);
-}
+    private:
+        FdoSecretsPlugin* m_plugin;
+        QByteArray m_propertyName;
+    };
+} // namespace
 
-QWidget* SettingsWidgetFdoSecrets::createManageButtons(Collection* coll)
+SettingsWidgetFdoSecrets::SettingsWidgetFdoSecrets(FdoSecretsPlugin* plugin, QWidget* parent)
+    : QWidget(parent)
+    , m_ui(new Ui::SettingsWidgetFdoSecrets())
+    , m_factory(new QItemEditorFactory)
+    , m_plugin(plugin)
 {
-    auto toolbar = new QToolBar;
-    toolbar->setFloatable(false);
-    toolbar->setMovable(false);
-
-    // db settings
-    auto dbSettingsAct = new QAction(tr("Database settings"), toolbar);
-    dbSettingsAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("document-edit")));
-    dbSettingsAct->setToolTip(tr("Edit database settings"));
-    dbSettingsAct->setEnabled(!coll->locked().value());
-    connect(dbSettingsAct, &QAction::triggered, this, [this, coll]() {
-        auto db = coll->backend();
-        m_plugin->serviceInstance()->doSwitchToChangeDatabaseSettings(db);
-    });
-    toolbar->addAction(dbSettingsAct);
-
-    // unlock/lock
-    auto lockAct = new QAction(tr("Unlock database"), toolbar);
-    lockAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("object-locked"), true));
-    lockAct->setToolTip(tr("Unlock database to show more information"));
-    connect(coll, &Collection::collectionLockChanged, lockAct, [lockAct, dbSettingsAct](bool locked) {
-        if (locked) {
-            lockAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("object-locked"), true));
-            lockAct->setToolTip(tr("Unlock database to show more information"));
-        } else {
-            lockAct->setIcon(filePath()->icon(QStringLiteral("actions"), QStringLiteral("object-unlocked"), true));
-            lockAct->setToolTip(tr("Lock database"));
-        }
-        dbSettingsAct->setEnabled(!locked);
-    });
-    connect(lockAct, &QAction::triggered, this, [coll]() {
-        if (coll->locked().value()) {
-            coll->doUnlock();
-        } else {
-            coll->doLock();
-        }
-    });
-    toolbar->addAction(lockAct);
+    m_ui->setupUi(this);
 
-    return toolbar;
-}
+    auto sessModel = new SettingsSessionModel(plugin, this);
+    m_ui->tableSessions->setModel(sessModel);
+    setupView(m_ui->tableSessions, 1, qMetaTypeId<Session*>(), new Creator<ManageSession>(m_plugin));
+
+    // config header after setting model, otherwise the header doesn't have enough sections
+    auto sessViewHeader = m_ui->tableSessions->horizontalHeader();
+    sessViewHeader->setSelectionMode(QAbstractItemView::NoSelection);
+    sessViewHeader->setSectionsClickable(false);
+    sessViewHeader->setSectionResizeMode(0, QHeaderView::Stretch); // application
+    sessViewHeader->setSectionResizeMode(1, QHeaderView::ResizeToContents); // disconnect button
+
+    auto dbModel = new SettingsDatabaseModel(plugin->dbTabs(), this);
+    m_ui->tableDatabases->setModel(dbModel);
+    setupView(m_ui->tableDatabases, 2, qMetaTypeId<DatabaseWidget*>(), new Creator<ManageDatabase>(m_plugin));
+
+    // config header after setting model, otherwise the header doesn't have enough sections
+    auto dbViewHeader = m_ui->tableDatabases->horizontalHeader();
+    dbViewHeader->setSelectionMode(QAbstractItemView::NoSelection);
+    dbViewHeader->setSectionsClickable(false);
+    dbViewHeader->setSectionResizeMode(0, QHeaderView::Stretch); // file name
+    dbViewHeader->setSectionResizeMode(1, QHeaderView::Stretch); // group
+    dbViewHeader->setSectionResizeMode(2, QHeaderView::ResizeToContents); // manage button
 
-void SettingsWidgetFdoSecrets::updateExposedGroupItem(QTableWidgetItem* item, Collection* coll)
-{
-    if (coll->locked().value()) {
-        item->setText(tr("Unlock to show"));
-        item->setIcon(filePath()->icon(QStringLiteral("apps"), QStringLiteral("object-locked"), true));
-        QFont font;
-        font.setItalic(true);
-        item->setFont(font);
-        return;
-    }
-
-    auto db = coll->backend()->database();
-    auto group = db->rootGroup()->findGroupByUuid(FdoSecrets::settings()->exposedGroup(db));
-    if (group) {
-        item->setText(group->name());
-        item->setIcon(group->isExpired() ? databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex)
-                                         : group->iconScaledPixmap());
-        if (group->isExpired()) {
-            QFont font;
-            font.setStrikeOut(true);
-            item->setFont(font);
-        }
-    } else {
-        item->setText(tr("None"));
-        item->setIcon(filePath()->icon(QStringLiteral("apps"), QStringLiteral("paint-none"), true));
-    }
+    m_ui->tabWidget->setEnabled(m_ui->enableFdoSecretService->isChecked());
+    connect(m_ui->enableFdoSecretService, &QCheckBox::toggled, m_ui->tabWidget, &QTabWidget::setEnabled);
 }
 
-void SettingsWidgetFdoSecrets::removeDatabaseRow(Collection* coll)
+void SettingsWidgetFdoSecrets::setupView(QAbstractItemView* view,
+                                         int manageColumn,
+                                         int editorTypeId,
+                                         QItemEditorCreatorBase* creator)
 {
-    int row = 0;
-    while (row != m_ui->tableDatabases->rowCount()) {
-        auto item = m_ui->tableDatabases->item(row, 0);
-        const auto itemColl = item->data(Qt::UserRole).value<Collection*>();
-        if (itemColl == coll) {
-            break;
-        }
-        ++row;
-    }
-    if (row == m_ui->tableDatabases->rowCount()) {
-        qWarning() << "Unknown Fdo Secret Service collection" << coll->name() << "while removing collection from table";
-        return;
-    }
-
-    m_ui->tableDatabases->removeRow(row);
+    auto manageButtonDelegate = new QStyledItemDelegate(this);
+    m_factory->registerEditor(editorTypeId, creator);
+    manageButtonDelegate->setItemEditorFactory(m_factory.data());
+    view->setItemDelegateForColumn(manageColumn, manageButtonDelegate);
+    connect(view->model(),
+            &QAbstractItemModel::rowsInserted,
+            this,
+            [view, manageColumn](const QModelIndex&, int first, int last) {
+                for (int i = first; i <= last; ++i) {
+                    auto idx = view->model()->index(i, manageColumn);
+                    view->openPersistentEditor(idx);
+                }
+            });
 }
 
+SettingsWidgetFdoSecrets::~SettingsWidgetFdoSecrets() = default;
+
 void SettingsWidgetFdoSecrets::loadSettings()
 {
     m_ui->enableFdoSecretService->setChecked(FdoSecrets::settings()->isEnabled());
@@ -269,52 +301,4 @@ void SettingsWidgetFdoSecrets::saveSettings()
     FdoSecrets::settings()->setNoConfirmDeleteItem(m_ui->noConfirmDeleteItem->isChecked());
 }
 
-void SettingsWidgetFdoSecrets::showEvent(QShowEvent* event)
-{
-    QWidget::showEvent(event);
-
-    QMetaObject::invokeMethod(this, "updateTables", Qt::QueuedConnection, Q_ARG(bool, true));
-}
-
-void SettingsWidgetFdoSecrets::hideEvent(QHideEvent* event)
-{
-    QWidget::hideEvent(event);
-
-    QMetaObject::invokeMethod(this, "updateTables", Qt::QueuedConnection, Q_ARG(bool, false));
-}
-
-void SettingsWidgetFdoSecrets::updateTables(bool enabled)
-{
-    if (enabled) {
-        // update the table
-        populateDatabases(m_ui->enableFdoSecretService->isChecked());
-        populateSessions(m_ui->enableFdoSecretService->isChecked());
-
-        // re-layout the widget to adjust the table cell size
-        adjustSize();
-
-        connect(m_ui->enableFdoSecretService, &QCheckBox::toggled, this, &SettingsWidgetFdoSecrets::populateSessions);
-        connect(m_ui->enableFdoSecretService, &QCheckBox::toggled, this, &SettingsWidgetFdoSecrets::populateDatabases);
-
-        auto service = m_plugin->serviceInstance();
-        if (service) {
-            connect(service, &Service::sessionOpened, this, &SettingsWidgetFdoSecrets::addSessionRow);
-            connect(service, &Service::sessionClosed, this, &SettingsWidgetFdoSecrets::removeSessionRow);
-            connect(service, &Service::collectionCreated, this, &SettingsWidgetFdoSecrets::addDatabaseRow);
-            connect(service, &Service::collectionDeleted, this, &SettingsWidgetFdoSecrets::removeDatabaseRow);
-        }
-    } else {
-        disconnect(
-            m_ui->enableFdoSecretService, &QCheckBox::toggled, this, &SettingsWidgetFdoSecrets::populateSessions);
-        disconnect(
-            m_ui->enableFdoSecretService, &QCheckBox::toggled, this, &SettingsWidgetFdoSecrets::populateDatabases);
-
-        auto service = m_plugin->serviceInstance();
-        if (service) {
-            disconnect(service, &Service::sessionOpened, this, &SettingsWidgetFdoSecrets::addSessionRow);
-            disconnect(service, &Service::sessionClosed, this, &SettingsWidgetFdoSecrets::removeSessionRow);
-            disconnect(service, &Service::collectionCreated, this, &SettingsWidgetFdoSecrets::addDatabaseRow);
-            disconnect(service, &Service::collectionDeleted, this, &SettingsWidgetFdoSecrets::removeDatabaseRow);
-        }
-    }
-}
+#include "SettingsWidgetFdoSecrets.moc"
diff --git a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.h b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.h
index eac1f1e3c8..2bf58f826e 100644
--- a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.h
+++ b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.h
@@ -21,7 +21,9 @@
 #include <QScopedPointer>
 #include <QWidget>
 
-class QTableWidgetItem;
+class QAbstractItemView;
+class QItemEditorCreatorBase;
+class QItemEditorFactory;
 
 namespace FdoSecrets
 {
@@ -48,28 +50,12 @@ public slots:
     void loadSettings();
     void saveSettings();
 
-private slots:
-    void populateSessions(bool enabled);
-    void populateDatabases(bool enabled);
-    void addSessionRow(FdoSecrets::Session* sess);
-    void removeSessionRow(FdoSecrets::Session* sess);
-    void addDatabaseRow(FdoSecrets::Collection* coll);
-    void removeDatabaseRow(FdoSecrets::Collection* coll);
-
-    void updateTables(bool enabled);
-
-protected:
-    void showEvent(QShowEvent* event) override;
-
-    void hideEvent(QHideEvent* event) override;
-
 private:
-    QWidget* createManageButtons(FdoSecrets::Collection* coll);
-
-    void updateExposedGroupItem(QTableWidgetItem* item, FdoSecrets::Collection* coll);
+    void setupView(QAbstractItemView* view, int manageColumn, int editorTypeId, QItemEditorCreatorBase* creator);
 
 private:
     QScopedPointer<Ui::SettingsWidgetFdoSecrets> m_ui;
+    QScopedPointer<QItemEditorFactory> m_factory;
     FdoSecretsPlugin* m_plugin;
 };
 
diff --git a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
index b77e086c9a..660181f5d1 100644
--- a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
+++ b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
@@ -75,7 +75,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QTableWidget" name="tableDatabases">
+        <widget class="QTableView" name="tableDatabases">
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -91,21 +91,6 @@
          <attribute name="verticalHeaderVisible">
           <bool>false</bool>
          </attribute>
-         <column>
-          <property name="text">
-           <string>File Name</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Group</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Manage</string>
-          </property>
-         </column>
         </widget>
        </item>
       </layout>
@@ -123,7 +108,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QTableWidget" name="tableSessions">
+        <widget class="QTableView" name="tableSessions">
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -139,16 +124,6 @@
          <attribute name="verticalHeaderVisible">
           <bool>false</bool>
          </attribute>
-         <column>
-          <property name="text">
-           <string>Application</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Manage</string>
-          </property>
-         </column>
         </widget>
        </item>
       </layout>
diff --git a/src/format/OpVaultReaderSections.cpp b/src/format/OpVaultReaderSections.cpp
index 68ad478d3c..4dcf80e480 100644
--- a/src/format/OpVaultReaderSections.cpp
+++ b/src/format/OpVaultReaderSections.cpp
@@ -83,7 +83,7 @@ void OpVaultReader::fillFromSectionField(Entry* entry, const QString& sectionNam
             }
             attrValue = query.toString(QUrl::FullyEncoded);
         }
-        entry->attributes()->set(Totp::ATTRIBUTE_SETTINGS, attrValue, true);
+        entry->setTotp(Totp::parseSettings(attrValue));
     } else if (attrName.startsWith("expir", Qt::CaseInsensitive)) {
         QDateTime expiry;
         if (kind == "date") {
diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp
index e7f138f153..620d3652b7 100644
--- a/src/gui/DatabaseOpenDialog.cpp
+++ b/src/gui/DatabaseOpenDialog.cpp
@@ -51,7 +51,7 @@ void DatabaseOpenDialog::setTargetDatabaseWidget(DatabaseWidget* dbWidget)
         disconnect(this, nullptr, m_dbWidget, nullptr);
     }
     m_dbWidget = dbWidget;
-    connect(this, SIGNAL(dialogFinished(bool)), dbWidget, SLOT(unlockDatabase(bool)));
+    connect(this, &DatabaseOpenDialog::dialogFinished, dbWidget, &DatabaseWidget::unlockDatabase);
 }
 
 void DatabaseOpenDialog::setIntent(DatabaseOpenDialog::Intent intent)
@@ -90,6 +90,6 @@ void DatabaseOpenDialog::complete(bool accepted)
     } else {
         reject();
     }
-    emit dialogFinished(accepted);
+    emit dialogFinished(accepted, m_dbWidget);
     clearForms();
 }
diff --git a/src/gui/DatabaseOpenDialog.h b/src/gui/DatabaseOpenDialog.h
index f2860fccb6..30ac4c762e 100644
--- a/src/gui/DatabaseOpenDialog.h
+++ b/src/gui/DatabaseOpenDialog.h
@@ -50,7 +50,7 @@ class DatabaseOpenDialog : public QDialog
     void clearForms();
 
 signals:
-    void dialogFinished(bool);
+    void dialogFinished(bool accepted, DatabaseWidget* dbWidget);
 
 public slots:
     void complete(bool accepted);
diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index a409aadc36..c610a773d9 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -204,9 +204,14 @@ void DatabaseOpenWidget::openDatabase()
 
     m_db.reset(new Database());
     QString error;
+
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    m_ui->passwordFormFrame->setEnabled(false);
+    QCoreApplication::processEvents();
     bool ok = m_db->open(m_filename, masterKey, &error, false);
     QApplication::restoreOverrideCursor();
+    m_ui->passwordFormFrame->setEnabled(true);
+
     if (!ok) {
         if (m_ui->editPassword->text().isEmpty() && !m_retryUnlockWithEmptyPassword) {
             QScopedPointer<QMessageBox> msgBox(new QMessageBox(this));
@@ -370,9 +375,11 @@ void DatabaseOpenWidget::browseKeyFile()
     QString filename = fileDialog()->getOpenFileName(this, tr("Select key file"), QString(), filters);
 
     if (QFileInfo(filename).canonicalFilePath() == QFileInfo(m_filename).canonicalFilePath()) {
-        MessageBox::warning(this,  tr("Cannot use database file as key file"),
-            tr("You cannot use your database file as a key file.\nIf you do not have a key file, please leave the field empty."),
-            MessageBox::Button::Ok);
+        MessageBox::warning(this,
+                            tr("Cannot use database file as key file"),
+                            tr("You cannot use your database file as a key file.\nIf you do not have a key file, "
+                               "please leave the field empty."),
+                            MessageBox::Button::Ok);
         filename = "";
     }
 
diff --git a/src/gui/DatabaseOpenWidget.ui b/src/gui/DatabaseOpenWidget.ui
index 14a1337c6e..60b2feadc2 100644
--- a/src/gui/DatabaseOpenWidget.ui
+++ b/src/gui/DatabaseOpenWidget.ui
@@ -132,7 +132,7 @@
             <number>15</number>
            </property>
            <item>
-            <widget class="QFrame" name="verticalFrame">
+            <widget class="QFrame" name="passwordFormFrame">
              <property name="minimumSize">
               <size>
                <width>400</width>
diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index 9cbfa8fd7b..c37e6c5ea6 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -63,6 +63,8 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
     connect(autoType(), SIGNAL(globalAutoTypeTriggered()), SLOT(performGlobalAutoType()));
     connect(autoType(), SIGNAL(autotypePerformed()), SLOT(relockPendingDatabase()));
     connect(autoType(), SIGNAL(autotypeRejected()), SLOT(relockPendingDatabase()));
+    connect(m_databaseOpenDialog.data(), &DatabaseOpenDialog::dialogFinished,
+            this, &DatabaseTabWidget::databaseUnlockDialogFinished);
     // clang-format on
 
 #ifdef Q_OS_MACOS
@@ -166,7 +168,8 @@ void DatabaseTabWidget::addDatabaseTab(const QString& filePath,
     for (int i = 0, c = count(); i < c; ++i) {
         auto* dbWidget = databaseWidgetFromIndex(i);
         Q_ASSERT(dbWidget);
-        if (dbWidget && dbWidget->database()->canonicalFilePath().compare(canonicalFilePath, FILE_CASE_SENSITIVE) == 0) {
+        if (dbWidget
+            && dbWidget->database()->canonicalFilePath().compare(canonicalFilePath, FILE_CASE_SENSITIVE) == 0) {
             dbWidget->performUnlockDatabase(password, keyfile);
             if (!inBackground) {
                 // switch to existing tab if file is already open
diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h
index 87e9bbf77a..5c55bc63c7 100644
--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@@ -90,6 +90,7 @@ public slots:
     void tabNameChanged();
     void messageGlobal(const QString&, MessageWidget::MessageType type);
     void messageDismissGlobal();
+    void databaseUnlockDialogFinished(bool accepted, DatabaseWidget* dbWidget);
 
 private slots:
     void toggleTabbar();
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 29942571c9..e7b6179fbc 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -275,6 +275,11 @@ bool DatabaseWidget::isEntryEditActive() const
     return currentWidget() == m_editEntryWidget;
 }
 
+bool DatabaseWidget::isGroupEditActive() const
+{
+    return currentWidget() == m_editGroupWidget;
+}
+
 bool DatabaseWidget::isEditWidgetModified() const
 {
     if (currentWidget() == m_editEntryWidget) {
@@ -387,6 +392,8 @@ void DatabaseWidget::createEntry()
 
 void DatabaseWidget::replaceDatabase(QSharedPointer<Database> db)
 {
+    Q_ASSERT(!isEntryEditActive() && !isGroupEditActive());
+
     // Save off new parent UUID which will be valid when creating a new entry
     QUuid newParentUuid;
     if (m_newParent) {
@@ -1370,7 +1377,7 @@ bool DatabaseWidget::lock()
     if (m_db->isModified()) {
         bool saved = false;
         // Attempt to save on exit, but don't block locking if it fails
-        if (config()->get("AutoSaveOnExit").toBool()) {
+        if (config()->get("AutoSaveOnExit").toBool() || config()->get("AutoSaveAfterEveryChange").toBool()) {
             saved = save();
         }
 
@@ -1421,7 +1428,8 @@ bool DatabaseWidget::lock()
 
 void DatabaseWidget::reloadDatabaseFile()
 {
-    if (!m_db || isLocked()) {
+    // Ignore reload if we are locked or currently editing an entry or group
+    if (!m_db || isLocked() || isEntryEditActive() || isGroupEditActive()) {
         return;
     }
 
@@ -1441,6 +1449,11 @@ void DatabaseWidget::reloadDatabaseFile()
         }
     }
 
+    // Lock out interactions
+    m_entryView->setDisabled(true);
+    m_groupView->setDisabled(true);
+    QApplication::processEvents();
+
     QString error;
     auto db = QSharedPointer<Database>::create(m_db->filePath());
     if (db->open(database()->key(), &error)) {
@@ -1480,6 +1493,10 @@ void DatabaseWidget::reloadDatabaseFile()
         // Mark db as modified since existing data may differ from file or file was deleted
         m_db->markAsModified();
     }
+
+    // Return control
+    m_entryView->setDisabled(false);
+    m_groupView->setDisabled(false);
 }
 
 int DatabaseWidget::numberOfSelectedEntries() const
@@ -1620,11 +1637,20 @@ bool DatabaseWidget::save()
     m_blockAutoSave = true;
     ++m_saveAttempts;
 
-    // TODO: Make this async, but lock out the database widget to prevent re-entrance
+    // TODO: Make this async
+    // Lock out interactions
+    m_entryView->setDisabled(true);
+    m_groupView->setDisabled(true);
+    QApplication::processEvents();
+
     bool useAtomicSaves = config()->get("UseAtomicSaves", true).toBool();
     QString errorMessage;
     bool ok = m_db->save(&errorMessage, useAtomicSaves, config()->get("BackupBeforeSave").toBool());
 
+    // Return control
+    m_entryView->setDisabled(false);
+    m_groupView->setDisabled(false);
+
     if (ok) {
         m_saveAttempts = 0;
         m_blockAutoSave = false;
@@ -1744,7 +1770,7 @@ void DatabaseWidget::processAutoOpen()
     }
 
     for (const auto* entry : autoopenGroup->entries()) {
-        if (entry->url().isEmpty() || entry->password().isEmpty()) {
+        if (entry->url().isEmpty() || (entry->password().isEmpty() && entry->username().isEmpty())) {
             continue;
         }
         QFileInfo filepath;
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 6f40c65c58..9f0c5c9765 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -81,6 +81,7 @@ class DatabaseWidget : public QStackedWidget
     bool isLocked() const;
     bool isSearchActive() const;
     bool isEntryEditActive() const;
+    bool isGroupEditActive() const;
 
     QString getCurrentSearch();
     void refreshSearch();
diff --git a/src/gui/Font.cpp b/src/gui/Font.cpp
index f53daed938..021380c298 100644
--- a/src/gui/Font.cpp
+++ b/src/gui/Font.cpp
@@ -36,6 +36,11 @@ QFont Font::fixedFont()
         fixedFont = consolasFont;
     }
 #endif
+#ifdef Q_OS_MACOS
+    // Qt doesn't choose a monospace font correctly on macOS
+    const QFont defaultFont;
+    fixedFont = QFontDatabase().font("Menlo", defaultFont.styleName(), defaultFont.pointSize());
+#endif
 
     return fixedFont;
 }
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 0d53d88a85..6452c051bb 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -885,8 +885,8 @@ void MainWindow::switchToPasswordGen(bool enabled)
     if (enabled) {
         m_ui->passwordGeneratorWidget->loadSettings();
         m_ui->passwordGeneratorWidget->regeneratePassword();
-        m_ui->passwordGeneratorWidget->setStandaloneMode(true);
         m_ui->stackedWidget->setCurrentIndex(PasswordGeneratorScreen);
+        m_ui->passwordGeneratorWidget->setStandaloneMode(true);
     } else {
         m_ui->passwordGeneratorWidget->saveSettings();
         switchToDatabases();
diff --git a/src/gui/SearchWidget.cpp b/src/gui/SearchWidget.cpp
index 5102d196fe..822d40ba15 100644
--- a/src/gui/SearchWidget.cpp
+++ b/src/gui/SearchWidget.cpp
@@ -60,7 +60,7 @@ SearchWidget::SearchWidget(QWidget* parent)
                                              .arg(QKeySequence(QKeySequence::Find).toString(QKeySequence::NativeText)));
     m_ui->searchEdit->installEventFilter(this);
 
-    m_searchMenu = new QMenu();
+    m_searchMenu = new QMenu(this);
     m_actionCaseSensitive = m_searchMenu->addAction(tr("Case sensitive"), this, SLOT(updateCaseSensitive()));
     m_actionCaseSensitive->setObjectName("actionSearchCaseSensitive");
     m_actionCaseSensitive->setCheckable(true);
diff --git a/src/gui/TotpDialog.cpp b/src/gui/TotpDialog.cpp
index 3f438e9ae3..639eb0ebde 100644
--- a/src/gui/TotpDialog.cpp
+++ b/src/gui/TotpDialog.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com>
+ *  Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com>
  *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -42,7 +42,7 @@ TotpDialog::TotpDialog(QWidget* parent, Entry* entry)
     resetCounter();
     updateProgressBar();
 
-    connect(parent, SIGNAL(lockedDatabase()), SLOT(close()));
+    connect(parent, SIGNAL(databaseLocked()), SLOT(close()));
     connect(&m_totpUpdateTimer, SIGNAL(timeout()), this, SLOT(updateProgressBar()));
     connect(&m_totpUpdateTimer, SIGNAL(timeout()), this, SLOT(updateSeconds()));
     m_totpUpdateTimer.start(m_step * 10);
diff --git a/src/gui/URLEdit.cpp b/src/gui/URLEdit.cpp
new file mode 100644
index 0000000000..4dc2a55c27
--- /dev/null
+++ b/src/gui/URLEdit.cpp
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2019 KeePassXC Team <team@keepassxc.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "URLEdit.h"
+
+#include <QRegularExpression>
+
+#include "core/Config.h"
+#include "core/FilePath.h"
+#include "core/Tools.h"
+#include "gui/Font.h"
+
+const QColor URLEdit::ErrorColor = QColor(255, 125, 125);
+
+URLEdit::URLEdit(QWidget* parent)
+    : QLineEdit(parent)
+{
+    const QIcon errorIcon = filePath()->icon("status", "dialog-error");
+    m_errorAction = addAction(errorIcon, QLineEdit::TrailingPosition);
+    m_errorAction->setVisible(false);
+    m_errorAction->setToolTip(tr("Invalid URL"));
+
+    updateStylesheet();
+}
+
+void URLEdit::enableVerifyMode()
+{
+    updateStylesheet();
+
+    connect(this, SIGNAL(textChanged(QString)), SLOT(updateStylesheet()));
+}
+
+void URLEdit::updateStylesheet()
+{
+    const QString stylesheetTemplate("QLineEdit { background: %1; }");
+
+    if (!Tools::checkUrlValid(text())) {
+        setStyleSheet(stylesheetTemplate.arg(ErrorColor.name()));
+        m_errorAction->setVisible(true);
+    } else {
+        m_errorAction->setVisible(false);
+        setStyleSheet("");
+    }
+}
diff --git a/src/gui/URLEdit.h b/src/gui/URLEdit.h
new file mode 100644
index 0000000000..11b743b41e
--- /dev/null
+++ b/src/gui/URLEdit.h
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2019 KeePassXC Team <team@keepassxc.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_URLEDIT_H
+#define KEEPASSX_URLEDIT_H
+
+#include <QAction>
+#include <QLineEdit>
+#include <QPointer>
+
+class URLEdit : public QLineEdit
+{
+    Q_OBJECT
+
+public:
+    static const QColor ErrorColor;
+
+    explicit URLEdit(QWidget* parent = nullptr);
+    void enableVerifyMode();
+
+private slots:
+    void updateStylesheet();
+
+private:
+    QPointer<QAction> m_errorAction;
+};
+
+#endif // KEEPASSX_URLEDIT_H
diff --git a/src/gui/dbsettings/DatabaseSettingsWidget.cpp b/src/gui/dbsettings/DatabaseSettingsWidget.cpp
index 224c4e5655..c7f7f400df 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidget.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsWidget.cpp
@@ -48,4 +48,3 @@ const QSharedPointer<Database> DatabaseSettingsWidget::getDatabase() const
 {
     return m_db;
 }
-
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 3fa75e3b8e..02b9f3a59c 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -167,6 +167,7 @@ void EditEntryWidget::setupMain()
 #ifdef WITH_XC_NETWORKING
     connect(m_mainUi->fetchFaviconButton, SIGNAL(clicked()), m_iconsWidget, SLOT(downloadFavicon()));
     connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), m_iconsWidget, SLOT(setUrl(QString)));
+    m_mainUi->urlEdit->enableVerifyMode();
 #endif
     connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool)));
     connect(m_mainUi->notesEnabled, SIGNAL(toggled(bool)), this, SLOT(toggleHideNotes(bool)));
@@ -201,7 +202,7 @@ void EditEntryWidget::setupAdvanced()
     connect(m_advancedUi->editAttributeButton, SIGNAL(clicked()), SLOT(editCurrentAttribute()));
     connect(m_advancedUi->removeAttributeButton, SIGNAL(clicked()), SLOT(removeCurrentAttribute()));
     connect(m_advancedUi->protectAttributeButton, SIGNAL(toggled(bool)), SLOT(protectCurrentAttribute(bool)));
-    connect(m_advancedUi->revealAttributeButton, SIGNAL(clicked(bool)), SLOT(revealCurrentAttribute()));
+    connect(m_advancedUi->revealAttributeButton, SIGNAL(clicked(bool)), SLOT(toggleCurrentAttributeVisibility()));
     connect(m_advancedUi->attributesView->selectionModel(),
             SIGNAL(currentChanged(QModelIndex,QModelIndex)),
             SLOT(updateCurrentAttribute()));
@@ -271,9 +272,14 @@ void EditEntryWidget::setupBrowser()
         m_additionalURLsDataModel->setEntryAttributes(m_entryAttributes);
         m_browserUi->additionalURLsView->setModel(m_additionalURLsDataModel);
 
+        // Use a custom item delegate to align the icon to the right side
+        auto iconDelegate = new URLModelIconDelegate(m_browserUi->additionalURLsView);
+        m_browserUi->additionalURLsView->setItemDelegate(iconDelegate);
+
         // clang-format off
         connect(m_browserUi->skipAutoSubmitCheckbox, SIGNAL(toggled(bool)), SLOT(updateBrowserModified()));
         connect(m_browserUi->hideEntryCheckbox, SIGNAL(toggled(bool)), SLOT(updateBrowserModified()));
+        connect(m_browserUi->onlyHttpAuthCheckbox, SIGNAL(toggled(bool)), SLOT(updateBrowserModified()));
         connect(m_browserUi->addURLButton, SIGNAL(clicked()), SLOT(insertURL()));
         connect(m_browserUi->removeURLButton, SIGNAL(clicked()), SLOT(removeCurrentURL()));
         connect(m_browserUi->editURLButton, SIGNAL(clicked()), SLOT(editCurrentURL()));
@@ -300,8 +306,10 @@ void EditEntryWidget::updateBrowser()
 
     auto skip = m_browserUi->skipAutoSubmitCheckbox->isChecked();
     auto hide = m_browserUi->hideEntryCheckbox->isChecked();
-    m_customData->set(BrowserService::OPTION_SKIP_AUTO_SUBMIT, (skip ? QString("true") : QString("false")));
-    m_customData->set(BrowserService::OPTION_HIDE_ENTRY, (hide ? QString("true") : QString("false")));
+    auto onlyHttpAuth = m_browserUi->onlyHttpAuthCheckbox->isChecked();
+    m_customData->set(BrowserService::OPTION_SKIP_AUTO_SUBMIT, (skip ? TRUE_STR : FALSE_STR));
+    m_customData->set(BrowserService::OPTION_HIDE_ENTRY, (hide ? TRUE_STR : FALSE_STR));
+    m_customData->set(BrowserService::OPTION_ONLY_HTTP_AUTH, (onlyHttpAuth ? TRUE_STR : FALSE_STR));
 }
 
 void EditEntryWidget::insertURL()
@@ -465,6 +473,7 @@ void EditEntryWidget::setupEntryUpdate()
     if (config()->get("Browser/Enabled", false).toBool()) {
         connect(m_browserUi->skipAutoSubmitCheckbox, SIGNAL(toggled(bool)), SLOT(setModified()));
         connect(m_browserUi->hideEntryCheckbox, SIGNAL(toggled(bool)), SLOT(setModified()));
+        connect(m_browserUi->onlyHttpAuthCheckbox, SIGNAL(toggled(bool)), SLOT(setModified()));
         connect(m_browserUi->addURLButton, SIGNAL(toggled(bool)), SLOT(setModified()));
         connect(m_browserUi->removeURLButton, SIGNAL(toggled(bool)), SLOT(setModified()));
         connect(m_browserUi->editURLButton, SIGNAL(toggled(bool)), SLOT(setModified()));
@@ -959,18 +968,25 @@ void EditEntryWidget::setForms(Entry* entry, bool restore)
 #ifdef WITH_XC_BROWSER
     if (m_customData->contains(BrowserService::OPTION_SKIP_AUTO_SUBMIT)) {
         // clang-format off
-        m_browserUi->skipAutoSubmitCheckbox->setChecked(m_customData->value(BrowserService::OPTION_SKIP_AUTO_SUBMIT) == "true");
+        m_browserUi->skipAutoSubmitCheckbox->setChecked(m_customData->value(BrowserService::OPTION_SKIP_AUTO_SUBMIT) == TRUE_STR);
         // clang-format on
     } else {
         m_browserUi->skipAutoSubmitCheckbox->setChecked(false);
     }
 
     if (m_customData->contains(BrowserService::OPTION_HIDE_ENTRY)) {
-        m_browserUi->hideEntryCheckbox->setChecked(m_customData->value(BrowserService::OPTION_HIDE_ENTRY) == "true");
+        m_browserUi->hideEntryCheckbox->setChecked(m_customData->value(BrowserService::OPTION_HIDE_ENTRY) == TRUE_STR);
     } else {
         m_browserUi->hideEntryCheckbox->setChecked(false);
     }
 
+    if (m_customData->contains(BrowserService::OPTION_ONLY_HTTP_AUTH)) {
+        m_browserUi->onlyHttpAuthCheckbox->setChecked(m_customData->value(BrowserService::OPTION_ONLY_HTTP_AUTH)
+                                                      == TRUE_STR);
+    } else {
+        m_browserUi->onlyHttpAuthCheckbox->setChecked(false);
+    }
+
     m_browserUi->addURLButton->setEnabled(!m_history);
     m_browserUi->removeURLButton->setEnabled(false);
     m_browserUi->editURLButton->setEnabled(false);
@@ -1297,6 +1313,7 @@ void EditEntryWidget::displayAttribute(QModelIndex index, bool showProtected)
     // Block signals to prevent modified being set
     m_advancedUi->protectAttributeButton->blockSignals(true);
     m_advancedUi->attributesEdit->blockSignals(true);
+    m_advancedUi->revealAttributeButton->setText(tr("Reveal"));
 
     if (index.isValid()) {
         QString key = m_attributesModel->keyByIndex(index);
@@ -1348,7 +1365,7 @@ void EditEntryWidget::protectCurrentAttribute(bool state)
     }
 }
 
-void EditEntryWidget::revealCurrentAttribute()
+void EditEntryWidget::toggleCurrentAttributeVisibility()
 {
     if (!m_advancedUi->attributesEdit->isEnabled()) {
         QModelIndex index = m_advancedUi->attributesView->currentIndex();
@@ -1359,6 +1376,10 @@ void EditEntryWidget::revealCurrentAttribute()
             m_advancedUi->attributesEdit->setEnabled(true);
             m_advancedUi->attributesEdit->blockSignals(oldBlockSignals);
         }
+        m_advancedUi->revealAttributeButton->setText(tr("Hide"));
+    } else {
+        protectCurrentAttribute(true);
+        m_advancedUi->revealAttributeButton->setText(tr("Reveal"));
     }
 }
 
diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
index 39b5fc5d96..300220cd0b 100644
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -93,7 +93,7 @@ private slots:
     void removeCurrentAttribute();
     void updateCurrentAttribute();
     void protectCurrentAttribute(bool state);
-    void revealCurrentAttribute();
+    void toggleCurrentAttributeVisibility();
     void updateAutoTypeEnabled();
     void openAutotypeHelp();
     void insertAutoTypeAssoc();
diff --git a/src/gui/entry/EditEntryWidgetBrowser.ui b/src/gui/entry/EditEntryWidgetBrowser.ui
index 4d0d29cf72..9d1e0f5117 100644
--- a/src/gui/entry/EditEntryWidgetBrowser.ui
+++ b/src/gui/entry/EditEntryWidgetBrowser.ui
@@ -50,6 +50,16 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="onlyHttpAuthCheckbox">
+        <property name="toolTip">
+         <string>Only send this setting to the browser for HTTP Auth dialogs. If enabled, normal login forms will not show this entry for selection.</string>
+        </property>
+        <property name="text">
+         <string>Use this entry only with HTTP Basic Auth</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -130,6 +140,7 @@
  <tabstops>
   <tabstop>skipAutoSubmitCheckbox</tabstop>
   <tabstop>hideEntryCheckbox</tabstop>
+  <tabstop>onlyHttpAuthCheckbox</tabstop>
   <tabstop>additionalURLsView</tabstop>
   <tabstop>addURLButton</tabstop>
   <tabstop>removeURLButton</tabstop>
diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
index 255cd0ab2f..54140fcd9f 100644
--- a/src/gui/entry/EditEntryWidgetMain.ui
+++ b/src/gui/entry/EditEntryWidgetMain.ui
@@ -30,7 +30,7 @@
    <item row="5" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_6">
      <item>
-      <widget class="QLineEdit" name="urlEdit">
+      <widget class="URLEdit" name="urlEdit">
        <property name="accessibleName">
         <string>Url field</string>
        </property>
@@ -256,6 +256,12 @@
    <header>gui/PasswordEdit.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>URLEdit</class>
+   <extends>QLineEdit</extends>
+   <header>gui/URLEdit.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>titleEdit</tabstop>
diff --git a/src/gui/entry/EntryURLModel.cpp b/src/gui/entry/EntryURLModel.cpp
index 3667c78f0c..3e6fb839c9 100644
--- a/src/gui/entry/EntryURLModel.cpp
+++ b/src/gui/entry/EntryURLModel.cpp
@@ -19,6 +19,7 @@
 #include "EntryURLModel.h"
 
 #include "core/Entry.h"
+#include "core/FilePath.h"
 #include "core/Tools.h"
 
 #include <algorithm>
@@ -26,6 +27,7 @@
 EntryURLModel::EntryURLModel(QObject* parent)
     : QStandardItemModel(parent)
     , m_entryAttributes(nullptr)
+    , m_errorIcon(filePath()->icon("status", "dialog-error"))
 {
 }
 
@@ -53,6 +55,33 @@ void EntryURLModel::setEntryAttributes(EntryAttributes* entryAttributes)
     endResetModel();
 }
 
+QVariant EntryURLModel::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    const auto key = keyByIndex(index);
+    if (key.isEmpty()) {
+        return {};
+    }
+
+    const auto value = m_entryAttributes->value(key);
+    const auto urlValid = Tools::checkUrlValid(value);
+
+    if (role == Qt::BackgroundRole && !urlValid) {
+        return QColor(255, 125, 125);
+    } else if (role == Qt::DecorationRole && !urlValid) {
+        return m_errorIcon;
+    } else if (role == Qt::DisplayRole || role == Qt::EditRole) {
+        return value;
+    } else if (role == Qt::ToolTipRole && !urlValid) {
+        return tr("Invalid URL");
+    }
+
+    return {};
+}
+
 bool EntryURLModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     if (!index.isValid() || role != Qt::EditRole || value.type() != QVariant::String || value.toString().isEmpty()) {
diff --git a/src/gui/entry/EntryURLModel.h b/src/gui/entry/EntryURLModel.h
index 09344d92af..f9ffa48288 100644
--- a/src/gui/entry/EntryURLModel.h
+++ b/src/gui/entry/EntryURLModel.h
@@ -20,9 +20,23 @@
 #define KEEPASSXC_ENTRYURLMODEL_H
 
 #include <QStandardItemModel>
+#include <QStyledItemDelegate>
 
 class EntryAttributes;
 
+class URLModelIconDelegate : public QStyledItemDelegate
+{
+public:
+    using QStyledItemDelegate::QStyledItemDelegate;
+
+protected:
+    void initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const override
+    {
+        QStyledItemDelegate::initStyleOption(option, index);
+        option->decorationPosition = QStyleOptionViewItem::Right;
+    }
+};
+
 class EntryURLModel : public QStandardItemModel
 {
     Q_OBJECT
@@ -32,6 +46,7 @@ class EntryURLModel : public QStandardItemModel
     void setEntryAttributes(EntryAttributes* entryAttributes);
     void insertRow(const QString& key, const QString& value);
     bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
+    QVariant data(const QModelIndex& index, int role) const override;
     QModelIndex indexByKey(const QString& key) const;
     QString keyByIndex(const QModelIndex& index) const;
 
@@ -41,6 +56,7 @@ private slots:
 private:
     QList<QPair<QString, QString>> m_urls;
     EntryAttributes* m_entryAttributes;
+    QIcon m_errorIcon;
 };
 
 #endif // KEEPASSXC_ENTRYURLMODEL_H
diff --git a/src/gui/macutils/AppKitImpl.mm b/src/gui/macutils/AppKitImpl.mm
index 44137ee7f8..4a93f963a9 100644
--- a/src/gui/macutils/AppKitImpl.mm
+++ b/src/gui/macutils/AppKitImpl.mm
@@ -20,11 +20,6 @@
 
 #import <AppKit/NSWorkspace.h>
 #import <CoreVideo/CVPixelBuffer.h>
-#import <Availability.h>
-
-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
-static const NSEventMask NSEventMaskKeyDown = NSKeyDownMask;
-#endif
 
 @implementation AppKitImpl
 
diff --git a/src/gui/masterkey/KeyFileEditWidget.h b/src/gui/masterkey/KeyFileEditWidget.h
index 7d5868e88a..dd414e133f 100644
--- a/src/gui/masterkey/KeyFileEditWidget.h
+++ b/src/gui/masterkey/KeyFileEditWidget.h
@@ -32,7 +32,6 @@ class KeyFileEditWidget : public KeyComponentWidget
 {
     Q_OBJECT
 
-
 public:
     explicit KeyFileEditWidget(DatabaseSettingsWidget* parent);
     Q_DISABLE_COPY(KeyFileEditWidget);
diff --git a/src/gui/masterkey/PasswordEditWidget.cpp b/src/gui/masterkey/PasswordEditWidget.cpp
index b27248d34b..9353cbe7a2 100644
--- a/src/gui/masterkey/PasswordEditWidget.cpp
+++ b/src/gui/masterkey/PasswordEditWidget.cpp
@@ -95,8 +95,6 @@ void PasswordEditWidget::initComponentEditWidget(QWidget* widget)
 
 void PasswordEditWidget::hideEvent(QHideEvent* event)
 {
-    Q_ASSERT(m_compUi->enterPasswordEdit);
-
     if (!isVisible() && m_compUi->enterPasswordEdit) {
         m_compUi->enterPasswordEdit->setText("");
         m_compUi->repeatPasswordEdit->setText("");
diff --git a/src/gui/widgets/ElidedLabel.cpp b/src/gui/widgets/ElidedLabel.cpp
index bc27717640..749f075c8d 100644
--- a/src/gui/widgets/ElidedLabel.cpp
+++ b/src/gui/widgets/ElidedLabel.cpp
@@ -105,8 +105,10 @@ void ElidedLabel::updateElidedText()
         const QFontMetrics metrix(font());
         displayText = metrix.elidedText(m_rawText, m_elideMode, width() - 2);
     }
-    setText(m_url.isEmpty() ? displayText : htmlLinkTemplate.arg(m_url, displayText));
-    setOpenExternalLinks(!m_url.isEmpty());
+
+    bool hasUrl = !m_url.isEmpty();
+    setText(hasUrl ? htmlLinkTemplate.arg(m_url.toHtmlEscaped(), displayText) : displayText);
+    setOpenExternalLinks(!hasUrl);
 }
 
 void ElidedLabel::resizeEvent(QResizeEvent* event)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9aac1b7d8e..1c0e5f7ed6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -164,7 +164,7 @@ endif()
 
 if(WITH_XC_CRYPTO_SSH)
     add_unit_test(NAME testopensshkey SOURCES TestOpenSSHKey.cpp
-	        LIBS ${TEST_LIBRARIES})
+            LIBS ${TEST_LIBRARIES})
 endif()
 
 add_unit_test(NAME testentry SOURCES TestEntry.cpp
@@ -192,7 +192,7 @@ add_unit_test(NAME testcsvparser SOURCES TestCsvParser.cpp
         LIBS ${TEST_LIBRARIES})
 
 add_unit_test(NAME testrandomgenerator SOURCES TestRandomGenerator.cpp
-	LIBS testsupport ${TEST_LIBRARIES})
+    LIBS testsupport ${TEST_LIBRARIES})
 
 add_unit_test(NAME testentrysearcher SOURCES TestEntrySearcher.cpp
         LIBS ${TEST_LIBRARIES})
@@ -206,7 +206,7 @@ add_unit_test(NAME testykchallengeresponsekey
 
 if(WITH_XC_KEESHARE)
     add_unit_test(NAME testsharing SOURCES TestSharing.cpp
-	    LIBS testsupport ${TEST_LIBRARIES})
+        LIBS testsupport ${TEST_LIBRARIES})
 endif()
 
 add_unit_test(NAME testdatabase SOURCES TestDatabase.cpp
diff --git a/tests/TestBrowser.cpp b/tests/TestBrowser.cpp
index bb3318d07a..8da2a28964 100644
--- a/tests/TestBrowser.cpp
+++ b/tests/TestBrowser.cpp
@@ -18,6 +18,7 @@
 #include "TestBrowser.h"
 #include "TestGlobal.h"
 #include "browser/BrowserSettings.h"
+#include "core/Tools.h"
 #include "crypto/Crypto.h"
 #include "sodium/crypto_box.h"
 #include <QString>
@@ -56,7 +57,7 @@ void TestBrowser::testChangePublicKeys()
     auto response = m_browserAction->handleAction(json);
     QCOMPARE(response["action"].toString(), QString("change-public-keys"));
     QCOMPARE(response["publicKey"].toString() == PUBLICKEY, false);
-    QCOMPARE(response["success"].toString(), QString("true"));
+    QCOMPARE(response["success"].toString(), TRUE_STR);
 }
 
 void TestBrowser::testEncryptMessage()
@@ -179,29 +180,22 @@ void TestBrowser::testSearchEntries()
     auto db = QSharedPointer<Database>::create();
     auto* root = db->rootGroup();
 
-    QList<QString> urls;
-    urls.push_back("https://github.com/login_page");
-    urls.push_back("https://github.com/login");
-    urls.push_back("https://github.com/");
-    urls.push_back("github.com/login");
-    urls.push_back("http://github.com");
-    urls.push_back("http://github.com/login");
-    urls.push_back("github.com");
-    urls.push_back("github.com/login");
-    urls.push_back("https://github"); // Invalid URL
-    urls.push_back("github.com");
+    QStringList urls = {"https://github.com/login_page",
+                        "https://github.com/login",
+                        "https://github.com/",
+                        "github.com/login",
+                        "http://github.com",
+                        "http://github.com/login",
+                        "github.com",
+                        "github.com/login",
+                        "https://github", // Invalid URL
+                        "github.com"};
 
-    for (int i = 0; i < urls.length(); ++i) {
-        auto entry = new Entry();
-        entry->setGroup(root);
-        entry->beginUpdate();
-        entry->setUrl(urls[i]);
-        entry->setUsername(QString("User %1").arg(i));
-        entry->endUpdate();
-    }
+    createEntries(urls, root);
 
     browserSettings()->setMatchUrlScheme(false);
-    auto result = m_browserService->searchEntries(db, "github.com", "https://github.com"); // db, hostname, url
+    auto result =
+        m_browserService->searchEntries(db, "https://github.com", "https://github.com/session"); // db, url, submitUrl
 
     QCOMPARE(result.length(), 9);
     QCOMPARE(result[0]->url(), QString("https://github.com/login_page"));
@@ -213,7 +207,7 @@ void TestBrowser::testSearchEntries()
 
     // With matching there should be only 3 results + 4 without a scheme
     browserSettings()->setMatchUrlScheme(true);
-    result = m_browserService->searchEntries(db, "github.com", "https://github.com"); // db, hostname, url
+    result = m_browserService->searchEntries(db, "https://github.com", "https://github.com/session");
     QCOMPARE(result.length(), 7);
     QCOMPARE(result[0]->url(), QString("https://github.com/login_page"));
     QCOMPARE(result[1]->url(), QString("https://github.com/login"));
@@ -226,22 +220,13 @@ void TestBrowser::testSearchEntriesWithPort()
     auto db = QSharedPointer<Database>::create();
     auto* root = db->rootGroup();
 
-    QList<QString> urls;
-    urls.push_back("http://127.0.0.1:443");
-    urls.push_back("http://127.0.0.1:80");
+    QStringList urls = {"http://127.0.0.1:443", "http://127.0.0.1:80"};
 
-    for (int i = 0; i < urls.length(); ++i) {
-        auto entry = new Entry();
-        entry->setGroup(root);
-        entry->beginUpdate();
-        entry->setUrl(urls[i]);
-        entry->setUsername(QString("User %1").arg(i));
-        entry->endUpdate();
-    }
+    createEntries(urls, root);
 
-    auto result = m_browserService->searchEntries(db, "127.0.0.1", "http://127.0.0.1:443"); // db, hostname, url
+    auto result = m_browserService->searchEntries(db, "http://127.0.0.1:443", "http://127.0.0.1");
     QCOMPARE(result.length(), 1);
-    QCOMPARE(result[0]->url(), urls[0]);
+    QCOMPARE(result[0]->url(), QString("http://127.0.0.1:443"));
 }
 
 void TestBrowser::testSearchEntriesWithAdditionalURLs()
@@ -249,70 +234,55 @@ void TestBrowser::testSearchEntriesWithAdditionalURLs()
     auto db = QSharedPointer<Database>::create();
     auto* root = db->rootGroup();
 
-    QList<Entry*> entries;
-    QList<QString> urls;
-    urls.push_back("https://github.com/");
-    urls.push_back("https://www.example.com");
-    urls.push_back("http://domain.com");
+    QStringList urls = {"https://github.com/", "https://www.example.com", "http://domain.com"};
 
-    for (int i = 0; i < urls.length(); ++i) {
-        auto entry = new Entry();
-        entry->setGroup(root);
-        entry->beginUpdate();
-        entry->setUrl(urls[i]);
-        entry->setUsername(QString("User %1").arg(i));
-        entry->endUpdate();
-        entries.push_back(entry);
-    }
+    auto entries = createEntries(urls, root);
 
     // Add an additional URL to the first entry
     entries.first()->attributes()->set(BrowserService::ADDITIONAL_URL, "https://keepassxc.org");
 
-    auto result = m_browserService->searchEntries(db, "github.com", "https://github.com"); // db, hostname, url
+    auto result = m_browserService->searchEntries(db, "https://github.com", "https://github.com/session");
     QCOMPARE(result.length(), 1);
-    QCOMPARE(result[0]->url(), urls[0]);
+    QCOMPARE(result[0]->url(), QString("https://github.com/"));
 
     // Search the additional URL. It should return the same entry
-    auto additionalResult = m_browserService->searchEntries(db, "keepassxc.org", "https://keepassxc.org");
+    auto additionalResult = m_browserService->searchEntries(db, "https://keepassxc.org", "https://keepassxc.org");
     QCOMPARE(additionalResult.length(), 1);
-    QCOMPARE(additionalResult[0]->url(), urls[0]);
+    QCOMPARE(additionalResult[0]->url(), QString("https://github.com/"));
 }
 
 void TestBrowser::testInvalidEntries()
 {
     auto db = QSharedPointer<Database>::create();
     auto* root = db->rootGroup();
+    const QString url("https://github.com");
+    const QString submitUrl("https://github.com/session");
 
-    QList<QString> urls;
-    urls.push_back("https://github.com/login");
-    urls.push_back("https:///github.com/"); // Extra '/'
-    urls.push_back("http://github.com/**//*");
-    urls.push_back("http://*.github.com/login");
-    urls.push_back("//github.com"); // fromUserInput() corrects this one.
-    urls.push_back("github.com/{}<>");
+    QStringList urls = {
+        "https://github.com/login",
+        "https:///github.com/", // Extra '/'
+        "http://github.com/**//*",
+        "http://*.github.com/login",
+        "//github.com", // fromUserInput() corrects this one.
+        "github.com/{}<>",
+        "http:/example.com",
+    };
 
-    for (int i = 0; i < urls.length(); ++i) {
-        auto entry = new Entry();
-        entry->setGroup(root);
-        entry->beginUpdate();
-        entry->setUrl(urls[i]);
-        entry->setUsername(QString("User %1").arg(i));
-        entry->endUpdate();
-    }
+    createEntries(urls, root);
 
     browserSettings()->setMatchUrlScheme(true);
-    auto result = m_browserService->searchEntries(db, "github.com", "https://github.com"); // db, hostname, url
+    auto result = m_browserService->searchEntries(db, "https://github.com", "https://github.com/session");
     QCOMPARE(result.length(), 2);
     QCOMPARE(result[0]->url(), QString("https://github.com/login"));
     QCOMPARE(result[1]->url(), QString("//github.com"));
 
     // Test the URL's directly
-    QCOMPARE(m_browserService->handleURL(urls[0], "github.com", "https://github.com"), true);
-    QCOMPARE(m_browserService->handleURL(urls[1], "github.com", "https://github.com"), false);
-    QCOMPARE(m_browserService->handleURL(urls[2], "github.com", "https://github.com"), false);
-    QCOMPARE(m_browserService->handleURL(urls[3], "github.com", "https://github.com"), false);
-    QCOMPARE(m_browserService->handleURL(urls[4], "github.com", "https://github.com"), true);
-    QCOMPARE(m_browserService->handleURL(urls[5], "github.com", "https://github.com"), false);
+    QCOMPARE(m_browserService->handleURL(urls[0], url, submitUrl), true);
+    QCOMPARE(m_browserService->handleURL(urls[1], url, submitUrl), false);
+    QCOMPARE(m_browserService->handleURL(urls[2], url, submitUrl), false);
+    QCOMPARE(m_browserService->handleURL(urls[3], url, submitUrl), false);
+    QCOMPARE(m_browserService->handleURL(urls[4], url, submitUrl), true);
+    QCOMPARE(m_browserService->handleURL(urls[5], url, submitUrl), false);
 }
 
 void TestBrowser::testSubdomainsAndPaths()
@@ -320,44 +290,74 @@ void TestBrowser::testSubdomainsAndPaths()
     auto db = QSharedPointer<Database>::create();
     auto* root = db->rootGroup();
 
-    QList<QString> urls;
-    urls.push_back("https://www.github.com/login/page.xml");
-    urls.push_back("https://login.github.com/");
-    urls.push_back("https://github.com");
-    urls.push_back("http://www.github.com");
-    urls.push_back("http://login.github.com/pathtonowhere");
-    urls.push_back(".github.com"); // Invalid URL
-    urls.push_back("www.github.com/");
-    urls.push_back("https://github"); // Invalid URL
+    QStringList urls = {
+        "https://www.github.com/login/page.xml",
+        "https://login.github.com/",
+        "https://github.com",
+        "http://www.github.com",
+        "http://login.github.com/pathtonowhere",
+        ".github.com", // Invalid URL
+        "www.github.com/",
+        "https://github" // Invalid URL
+    };
 
-    for (int i = 0; i < urls.length(); ++i) {
-        auto entry = new Entry();
-        entry->setGroup(root);
-        entry->beginUpdate();
-        entry->setUrl(urls[i]);
-        entry->setUsername(QString("User %1").arg(i));
-        entry->endUpdate();
-    }
+    createEntries(urls, root);
 
     browserSettings()->setMatchUrlScheme(false);
-    auto result = m_browserService->searchEntries(db, "github.com", "https://github.com"); // db, hostname, url
+    auto result = m_browserService->searchEntries(db, "https://github.com", "https://github.com/session");
+    QCOMPARE(result.length(), 1);
+    QCOMPARE(result[0]->url(), QString("https://github.com"));
 
-    QCOMPARE(result.length(), 6);
-    QCOMPARE(result[0]->url(), urls[0]);
-    QCOMPARE(result[1]->url(), urls[1]);
-    QCOMPARE(result[2]->url(), urls[2]);
-    QCOMPARE(result[3]->url(), urls[3]);
-    QCOMPARE(result[4]->url(), urls[4]);
-    QCOMPARE(result[5]->url(), urls[6]);
+    // With www subdomain
+    result = m_browserService->searchEntries(db, "https://www.github.com", "https://www.github.com/session");
+    QCOMPARE(result.length(), 4);
+    QCOMPARE(result[0]->url(), QString("https://www.github.com/login/page.xml"));
+    QCOMPARE(result[1]->url(), QString("https://github.com")); // Accepts any subdomain
+    QCOMPARE(result[2]->url(), QString("http://www.github.com"));
+    QCOMPARE(result[3]->url(), QString("www.github.com/"));
 
-    // With matching there should be only 3 results
+    // With scheme matching there should be only 1 result
     browserSettings()->setMatchUrlScheme(true);
-    result = m_browserService->searchEntries(db, "github.com", "https://github.com"); // db, hostname, url
+    result = m_browserService->searchEntries(db, "https://github.com", "https://github.com/session");
+    QCOMPARE(result.length(), 1);
+    QCOMPARE(result[0]->url(), QString("https://github.com"));
+
+    // Test site with subdomain in the site URL
+    QStringList entryURLs = {
+        "https://accounts.example.com",
+        "https://accounts.example.com/path",
+        "https://subdomain.example.com/",
+        "https://another.accounts.example.com/",
+        "https://another.subdomain.example.com/",
+        "https://example.com/",
+        "https://example" // Invalid URL
+    };
+
+    createEntries(entryURLs, root);
+
+    result = m_browserService->searchEntries(db, "https://accounts.example.com", "https://accounts.example.com");
+    QCOMPARE(result.length(), 3);
+    QCOMPARE(result[0]->url(), QString("https://accounts.example.com"));
+    QCOMPARE(result[1]->url(), QString("https://accounts.example.com/path"));
+    QCOMPARE(result[2]->url(), QString("https://example.com/")); // Accepts any subdomain
+
+    result = m_browserService->searchEntries(
+        db, "https://another.accounts.example.com", "https://another.accounts.example.com");
     QCOMPARE(result.length(), 4);
-    QCOMPARE(result[0]->url(), urls[0]);
-    QCOMPARE(result[1]->url(), urls[1]);
-    QCOMPARE(result[2]->url(), urls[2]);
-    QCOMPARE(result[3]->url(), urls[6]);
+    QCOMPARE(result[0]->url(),
+             QString("https://accounts.example.com")); // Accepts any subdomain under accounts.example.com
+    QCOMPARE(result[1]->url(), QString("https://accounts.example.com/path"));
+    QCOMPARE(result[2]->url(), QString("https://another.accounts.example.com/"));
+    QCOMPARE(result[3]->url(), QString("https://example.com/")); // Accepts one or more subdomains
+
+    // Test local files. It should be a direct match.
+    QStringList localFiles = {"file:///Users/testUser/tests/test.html"};
+
+    createEntries(localFiles, root);
+
+    // With local files, url is always set to the file scheme + ://. Submit URL holds the actual URL.
+    result = m_browserService->searchEntries(db, "file://", "file:///Users/testUser/tests/test.html");
+    QCOMPARE(result.length(), 1);
 }
 
 void TestBrowser::testSortEntries()
@@ -365,28 +365,18 @@ void TestBrowser::testSortEntries()
     auto db = QSharedPointer<Database>::create();
     auto* root = db->rootGroup();
 
-    QList<QString> urls;
-    urls.push_back("https://github.com/login_page");
-    urls.push_back("https://github.com/login");
-    urls.push_back("https://github.com/");
-    urls.push_back("github.com/login");
-    urls.push_back("http://github.com");
-    urls.push_back("http://github.com/login");
-    urls.push_back("github.com");
-    urls.push_back("github.com/login");
-    urls.push_back("https://github"); // Invalid URL
-    urls.push_back("github.com");
+    QStringList urls = {"https://github.com/login_page",
+                        "https://github.com/login",
+                        "https://github.com/",
+                        "github.com/login",
+                        "http://github.com",
+                        "http://github.com/login",
+                        "github.com",
+                        "github.com/login",
+                        "https://github", // Invalid URL
+                        "github.com"};
 
-    QList<Entry*> entries;
-    for (int i = 0; i < urls.length(); ++i) {
-        auto entry = new Entry();
-        entry->setGroup(root);
-        entry->beginUpdate();
-        entry->setUrl(urls[i]);
-        entry->setUsername(QString("User %1").arg(i));
-        entry->endUpdate();
-        entries.push_back(entry);
-    }
+    auto entries = createEntries(urls, root);
 
     browserSettings()->setBestMatchOnly(false);
     auto result =
@@ -400,7 +390,6 @@ void TestBrowser::testSortEntries()
     QCOMPARE(result[2]->url(), QString("https://github.com/login"));
     QCOMPARE(result[3]->username(), QString("User 3"));
     QCOMPARE(result[3]->url(), QString("github.com/login"));
-
 }
 
 void TestBrowser::testGetDatabaseGroups()
@@ -458,3 +447,38 @@ void TestBrowser::testGetDatabaseGroups()
     auto lastChild = lastChildren.at(0);
     QCOMPARE(lastChild.toObject()["name"].toString(), QString("group2_1_1"));
 }
+
+QList<Entry*> TestBrowser::createEntries(QStringList& urls, Group* root) const
+{
+    QList<Entry*> entries;
+    for (int i = 0; i < urls.length(); ++i) {
+        auto entry = new Entry();
+        entry->setGroup(root);
+        entry->beginUpdate();
+        entry->setUrl(urls[i]);
+        entry->setUsername(QString("User %1").arg(i));
+        entry->endUpdate();
+        entries.push_back(entry);
+    }
+
+    return entries;
+}
+void TestBrowser::testValidURLs()
+{
+    QHash<QString, bool> urls;
+    urls["https://github.com/login"] = true;
+    urls["https:///github.com/"] = false;
+    urls["http://github.com/**//*"] = false;
+    urls["http://*.github.com/login"] = false;
+    urls["//github.com"] = true;
+    urls["github.com/{}<>"] = false;
+    urls["http:/example.com"] = false;
+    urls["cmd://C:/Toolchains/msys2/usr/bin/mintty \"ssh jon@192.168.0.1:22\""] = true;
+    urls["file:///Users/testUser/Code/test.html"] = true;
+
+    QHashIterator<QString, bool> i(urls);
+    while (i.hasNext()) {
+        i.next();
+        QCOMPARE(Tools::checkUrlValid(i.key()), i.value());
+    }
+}
diff --git a/tests/TestBrowser.h b/tests/TestBrowser.h
index 981c1642d1..69ba693095 100644
--- a/tests/TestBrowser.h
+++ b/tests/TestBrowser.h
@@ -47,8 +47,11 @@ private slots:
     void testSubdomainsAndPaths();
     void testSortEntries();
     void testGetDatabaseGroups();
+    void testValidURLs();
 
 private:
+    QList<Entry*> createEntries(QStringList& urls, Group* root) const;
+
     QScopedPointer<BrowserAction> m_browserAction;
     QScopedPointer<BrowserService> m_browserService;
 };
diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp
index 8a9ab50cea..076f7f74ed 100644
--- a/tests/TestCli.cpp
+++ b/tests/TestCli.cpp
@@ -23,13 +23,13 @@
 #include "core/Global.h"
 #include "core/Tools.h"
 #include "crypto/Crypto.h"
-#include "keys/drivers/YubiKey.h"
 #include "format/Kdbx3Reader.h"
 #include "format/Kdbx3Writer.h"
 #include "format/Kdbx4Reader.h"
 #include "format/Kdbx4Writer.h"
 #include "format/KdbxXmlReader.h"
 #include "format/KeePass2.h"
+#include "keys/drivers/YubiKey.h"
 
 #include "cli/Add.h"
 #include "cli/AddGroup.h"
@@ -1422,6 +1422,107 @@ void TestCli::testMerge()
     QCOMPARE(m_stdoutFile->readAll(), QByteArray(""));
 }
 
+void TestCli::testMergeWithKeys()
+{
+    Create createCmd;
+    QVERIFY(!createCmd.name.isEmpty());
+    QVERIFY(createCmd.getDescriptionLine().contains(createCmd.name));
+
+    Merge mergeCmd;
+    QVERIFY(!mergeCmd.name.isEmpty());
+    QVERIFY(mergeCmd.getDescriptionLine().contains(mergeCmd.name));
+
+    Kdbx4Writer writer;
+    Kdbx4Reader reader;
+
+    QScopedPointer<QTemporaryDir> testDir(new QTemporaryDir());
+
+    QString sourceDatabaseFilename = testDir->path() + "/testSourceDatabase.kdbx";
+    QString sourceKeyfilePath = testDir->path() + "/testSourceKeyfile.txt";
+
+    QString targetDatabaseFilename = testDir->path() + "/testTargetDatabase.kdbx";
+    QString targetKeyfilePath = testDir->path() + "/testTargetKeyfile.txt";
+
+    qint64 pos = m_stdoutFile->pos();
+
+    Utils::Test::setNextPassword("a");
+    createCmd.execute({"create", sourceDatabaseFilename, "-k", sourceKeyfilePath});
+
+    Utils::Test::setNextPassword("b");
+    createCmd.execute({"create", targetDatabaseFilename, "-k", targetKeyfilePath});
+
+    Utils::Test::setNextPassword("a");
+    auto sourceDatabase = QSharedPointer<Database>(
+        Utils::unlockDatabase(sourceDatabaseFilename, true, sourceKeyfilePath, "", Utils::STDOUT));
+    QVERIFY(sourceDatabase);
+
+    Utils::Test::setNextPassword("b");
+    auto targetDatabase = QSharedPointer<Database>(
+        Utils::unlockDatabase(targetDatabaseFilename, true, targetKeyfilePath, "", Utils::STDOUT));
+    QVERIFY(targetDatabase);
+
+    auto* rootGroup = new Group();
+    rootGroup->setName("root");
+    rootGroup->setUuid(QUuid::createUuid());
+    auto* group = new Group();
+    group->setUuid(QUuid::createUuid());
+    group->setParent(rootGroup);
+    group->setName("Internet");
+
+    auto* entry = new Entry();
+    entry->setUuid(QUuid::createUuid());
+    entry->setTitle("Some Website");
+    entry->setPassword("secretsecretsecret");
+    group->addEntry(entry);
+
+    sourceDatabase->setRootGroup(rootGroup);
+
+    auto* otherRootGroup = new Group();
+    otherRootGroup->setName("root");
+    otherRootGroup->setUuid(QUuid::createUuid());
+    auto* otherGroup = new Group();
+    otherGroup->setUuid(QUuid::createUuid());
+    otherGroup->setParent(otherRootGroup);
+    otherGroup->setName("Internet");
+
+    auto* otherEntry = new Entry();
+    otherEntry->setUuid(QUuid::createUuid());
+    otherEntry->setTitle("Some Website 2");
+    otherEntry->setPassword("secretsecretsecret 2");
+    otherGroup->addEntry(otherEntry);
+
+    targetDatabase->setRootGroup(otherRootGroup);
+
+    QFile sourceDatabaseFile(sourceDatabaseFilename);
+    sourceDatabaseFile.open(QIODevice::WriteOnly);
+    QVERIFY(writer.writeDatabase(&sourceDatabaseFile, sourceDatabase.data()));
+    sourceDatabaseFile.flush();
+    sourceDatabaseFile.close();
+
+    QFile targetDatabaseFile(targetDatabaseFilename);
+    targetDatabaseFile.open(QIODevice::WriteOnly);
+    QVERIFY(writer.writeDatabase(&targetDatabaseFile, targetDatabase.data()));
+    targetDatabaseFile.flush();
+    targetDatabaseFile.close();
+
+    pos = m_stdoutFile->pos();
+    Utils::Test::setNextPassword("b");
+    Utils::Test::setNextPassword("a");
+    mergeCmd.execute({"merge",
+                      "-k",
+                      targetKeyfilePath,
+                      "--key-file-from",
+                      sourceKeyfilePath,
+                      targetDatabaseFile.fileName(),
+                      sourceDatabaseFile.fileName()});
+
+    m_stdoutFile->seek(pos);
+    QList<QByteArray> lines = m_stdoutFile->readAll().split('\n');
+    QVERIFY(lines.contains(QString("Successfully merged %1 into %2.")
+                               .arg(sourceDatabaseFile.fileName(), targetDatabaseFile.fileName())
+                               .toUtf8()));
+}
+
 void TestCli::testMove()
 {
     Move moveCmd;
diff --git a/tests/TestCli.h b/tests/TestCli.h
index bd0f9fc3fe..4947ee472b 100644
--- a/tests/TestCli.h
+++ b/tests/TestCli.h
@@ -66,6 +66,7 @@ private slots:
     void testList();
     void testLocate();
     void testMerge();
+    void testMergeWithKeys();
     void testMove();
     void testOpen();
     void testRemove();
diff --git a/tests/TestFdoSecrets.cpp b/tests/TestFdoSecrets.cpp
index 6994f60abf..299c3f7bfc 100644
--- a/tests/TestFdoSecrets.cpp
+++ b/tests/TestFdoSecrets.cpp
@@ -21,9 +21,9 @@
 
 #include "core/EntrySearcher.h"
 #include "fdosecrets/GcryptMPI.h"
-#include "fdosecrets/objects/SessionCipher.h"
 #include "fdosecrets/objects/Collection.h"
 #include "fdosecrets/objects/Item.h"
+#include "fdosecrets/objects/SessionCipher.h"
 
 #include "crypto/Crypto.h"
 
@@ -96,8 +96,8 @@ void TestFdoSecrets::testDhIetf1024Sha256Aes128CbcPkcs7()
 
 void TestFdoSecrets::testCrazyAttributeKey()
 {
-    using FdoSecrets::Item;
     using FdoSecrets::Collection;
+    using FdoSecrets::Item;
 
     const QScopedPointer<Group> root(new Group());
     const QScopedPointer<Entry> e1(new Entry());
@@ -112,3 +112,35 @@ void TestFdoSecrets::testCrazyAttributeKey()
     const auto res = EntrySearcher().search({term}, root.data());
     QCOMPARE(res.count(), 1);
 }
+
+void TestFdoSecrets::testSpecialCharsInAttributeValue()
+{
+    using FdoSecrets::Collection;
+    using FdoSecrets::Item;
+
+    const QScopedPointer<Group> root(new Group());
+    QScopedPointer<Entry> e1(new Entry());
+    e1->setGroup(root.data());
+
+    e1->setTitle("titleA");
+    e1->attributes()->set("testAttribute", "OAuth::[test.name@gmail.com]");
+
+    QScopedPointer<Entry> e2(new Entry());
+    e2->setGroup(root.data());
+    e2->setTitle("titleB");
+    e2->attributes()->set("testAttribute", "Abc:*+.-");
+
+    // search for custom entries via programatic API
+    {
+        const auto term = Collection::attributeToTerm("testAttribute", "OAuth::[test.name@gmail.com]");
+        const auto res = EntrySearcher().search({term}, root.data());
+        QCOMPARE(res.count(), 1);
+        QCOMPARE(res[0]->title(), QStringLiteral("titleA"));
+    }
+    {
+        const auto term = Collection::attributeToTerm("testAttribute", "Abc:*+.-");
+        const auto res = EntrySearcher().search({term}, root.data());
+        QCOMPARE(res.count(), 1);
+        QCOMPARE(res[0]->title(), QStringLiteral("titleB"));
+    }
+}
diff --git a/tests/TestFdoSecrets.h b/tests/TestFdoSecrets.h
index e108a81b9e..1cecbbeacb 100644
--- a/tests/TestFdoSecrets.h
+++ b/tests/TestFdoSecrets.h
@@ -31,6 +31,7 @@ private slots:
     void testGcryptMPI();
     void testDhIetf1024Sha256Aes128CbcPkcs7();
     void testCrazyAttributeKey();
+    void testSpecialCharsInAttributeValue();
 };
 
 #endif // KEEPASSXC_TESTFDOSECRETS_H
diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp
index 9fc39dc64e..47a917e436 100644
--- a/tests/TestGroup.cpp
+++ b/tests/TestGroup.cpp
@@ -20,6 +20,7 @@
 #include "TestGlobal.h"
 #include "mock/MockClock.h"
 
+#include <QScopedPointer>
 #include <QSignalSpy>
 
 #include "core/Metadata.h"
@@ -798,16 +799,16 @@ void TestGroup::testAddEntryWithPath()
 
 void TestGroup::testIsRecycled()
 {
-    Database* db = new Database();
-    db->metadata()->setRecycleBinEnabled(true);
+    Database db;
+    db.metadata()->setRecycleBinEnabled(true);
 
     Group* group1 = new Group();
     group1->setName("group1");
-    group1->setParent(db->rootGroup());
+    group1->setParent(db.rootGroup());
 
     Group* group2 = new Group();
     group2->setName("group2");
-    group2->setParent(db->rootGroup());
+    group2->setParent(db.rootGroup());
 
     Group* group3 = new Group();
     group3->setName("group3");
@@ -815,16 +816,16 @@ void TestGroup::testIsRecycled()
 
     Group* group4 = new Group();
     group4->setName("group4");
-    group4->setParent(db->rootGroup());
+    group4->setParent(db.rootGroup());
 
-    db->recycleGroup(group2);
+    db.recycleGroup(group2);
 
     QVERIFY(!group1->isRecycled());
     QVERIFY(group2->isRecycled());
     QVERIFY(group3->isRecycled());
     QVERIFY(!group4->isRecycled());
 
-    db->recycleGroup(group4);
+    db.recycleGroup(group4);
     QVERIFY(group4->isRecycled());
 }
 
@@ -1052,12 +1053,12 @@ void TestGroup::testChildrenSort()
 
 void TestGroup::testHierarchy()
 {
-    Group* group1 = new Group();
-    group1->setName("group1");
+    Group group1;
+    group1.setName("group1");
 
     Group* group2 = new Group();
     group2->setName("group2");
-    group2->setParent(group1);
+    group2->setParent(&group1);
 
     Group* group3 = new Group();
     group3->setName("group3");
@@ -1085,11 +1086,11 @@ void TestGroup::testHierarchy()
 void TestGroup::testApplyGroupIconRecursively()
 {
     // Create a database with two nested groups with one entry each
-    Database* database = new Database();
+    Database database;
 
     Group* subgroup = new Group();
     subgroup->setName("Subgroup");
-    subgroup->setParent(database->rootGroup());
+    subgroup->setParent(database.rootGroup());
     QVERIFY(subgroup);
 
     Group* subsubgroup = new Group();
@@ -1108,10 +1109,10 @@ void TestGroup::testApplyGroupIconRecursively()
     // Set an icon per number to the root group and apply recursively
     // -> all groups and entries have the same icon
     const int rootIconNumber = 42;
-    database->rootGroup()->setIcon(rootIconNumber);
-    QVERIFY(database->rootGroup()->iconNumber() == rootIconNumber);
-    database->rootGroup()->applyGroupIconToChildGroups();
-    database->rootGroup()->applyGroupIconToChildEntries();
+    database.rootGroup()->setIcon(rootIconNumber);
+    QVERIFY(database.rootGroup()->iconNumber() == rootIconNumber);
+    database.rootGroup()->applyGroupIconToChildGroups();
+    database.rootGroup()->applyGroupIconToChildEntries();
     QVERIFY(subgroup->iconNumber() == rootIconNumber);
     QVERIFY(subgroupEntry->iconNumber() == rootIconNumber);
     QVERIFY(subsubgroup->iconNumber() == rootIconNumber);
@@ -1124,7 +1125,7 @@ void TestGroup::testApplyGroupIconRecursively()
     QVERIFY(subsubgroup->iconNumber() == subsubgroupIconNumber);
     subsubgroup->applyGroupIconToChildGroups();
     subsubgroup->applyGroupIconToChildEntries();
-    QVERIFY(database->rootGroup()->iconNumber() == rootIconNumber);
+    QVERIFY(database.rootGroup()->iconNumber() == rootIconNumber);
     QVERIFY(subgroup->iconNumber() == rootIconNumber);
     QVERIFY(subgroupEntry->iconNumber() == rootIconNumber);
     QVERIFY(subsubgroup->iconNumber() == subsubgroupIconNumber);
@@ -1135,11 +1136,11 @@ void TestGroup::testApplyGroupIconRecursively()
     const QUuid subgroupIconUuid = QUuid::createUuid();
     QImage subgroupIcon(16, 16, QImage::Format_RGB32);
     subgroupIcon.setPixel(0, 0, qRgb(255, 0, 0));
-    database->metadata()->addCustomIcon(subgroupIconUuid, subgroupIcon);
+    database.metadata()->addCustomIcon(subgroupIconUuid, subgroupIcon);
     subgroup->setIcon(subgroupIconUuid);
     subgroup->applyGroupIconToChildGroups();
     subgroup->applyGroupIconToChildEntries();
-    QVERIFY(database->rootGroup()->iconNumber() == rootIconNumber);
+    QVERIFY(database.rootGroup()->iconNumber() == rootIconNumber);
     QCOMPARE(subgroup->iconUuid(), subgroupIconUuid);
     QCOMPARE(subgroup->icon(), subgroupIcon);
     QCOMPARE(subgroupEntry->iconUuid(), subgroupIconUuid);
@@ -1150,10 +1151,10 @@ void TestGroup::testApplyGroupIconRecursively()
     QCOMPARE(subsubgroupEntry->icon(), subgroupIcon);
 
     // Reset all icons to root icon
-    database->rootGroup()->setIcon(rootIconNumber);
-    QVERIFY(database->rootGroup()->iconNumber() == rootIconNumber);
-    database->rootGroup()->applyGroupIconToChildGroups();
-    database->rootGroup()->applyGroupIconToChildEntries();
+    database.rootGroup()->setIcon(rootIconNumber);
+    QVERIFY(database.rootGroup()->iconNumber() == rootIconNumber);
+    database.rootGroup()->applyGroupIconToChildGroups();
+    database.rootGroup()->applyGroupIconToChildEntries();
     QVERIFY(subgroup->iconNumber() == rootIconNumber);
     QVERIFY(subgroupEntry->iconNumber() == rootIconNumber);
     QVERIFY(subsubgroup->iconNumber() == rootIconNumber);
@@ -1161,10 +1162,10 @@ void TestGroup::testApplyGroupIconRecursively()
 
     // Apply only for child groups
     const int iconForGroups = 10;
-    database->rootGroup()->setIcon(iconForGroups);
-    QVERIFY(database->rootGroup()->iconNumber() == iconForGroups);
-    database->rootGroup()->applyGroupIconToChildGroups();
-    QVERIFY(database->rootGroup()->iconNumber() == iconForGroups);
+    database.rootGroup()->setIcon(iconForGroups);
+    QVERIFY(database.rootGroup()->iconNumber() == iconForGroups);
+    database.rootGroup()->applyGroupIconToChildGroups();
+    QVERIFY(database.rootGroup()->iconNumber() == iconForGroups);
     QVERIFY(subgroup->iconNumber() == iconForGroups);
     QVERIFY(subgroupEntry->iconNumber() == rootIconNumber);
     QVERIFY(subsubgroup->iconNumber() == iconForGroups);
@@ -1172,10 +1173,10 @@ void TestGroup::testApplyGroupIconRecursively()
 
     // Apply only for child entries
     const int iconForEntries = 20;
-    database->rootGroup()->setIcon(iconForEntries);
-    QVERIFY(database->rootGroup()->iconNumber() == iconForEntries);
-    database->rootGroup()->applyGroupIconToChildEntries();
-    QVERIFY(database->rootGroup()->iconNumber() == iconForEntries);
+    database.rootGroup()->setIcon(iconForEntries);
+    QVERIFY(database.rootGroup()->iconNumber() == iconForEntries);
+    database.rootGroup()->applyGroupIconToChildEntries();
+    QVERIFY(database.rootGroup()->iconNumber() == iconForEntries);
     QVERIFY(subgroup->iconNumber() == iconForGroups);
     QVERIFY(subgroupEntry->iconNumber() == iconForEntries);
     QVERIFY(subsubgroup->iconNumber() == iconForGroups);
@@ -1184,15 +1185,15 @@ void TestGroup::testApplyGroupIconRecursively()
 
 void TestGroup::testUsernamesRecursive()
 {
-    Database* database = new Database();
+    Database database;
 
     // Create a subgroup
     Group* subgroup = new Group();
     subgroup->setName("Subgroup");
-    subgroup->setParent(database->rootGroup());
+    subgroup->setParent(database.rootGroup());
 
     // Generate entries in the root group and the subgroup
-    Entry* rootGroupEntry = database->rootGroup()->addEntryWithPath("Root group entry");
+    Entry* rootGroupEntry = database.rootGroup()->addEntryWithPath("Root group entry");
     rootGroupEntry->setUsername("Name1");
 
     Entry* subgroupEntry = subgroup->addEntryWithPath("Subgroup entry");
@@ -1201,7 +1202,7 @@ void TestGroup::testUsernamesRecursive()
     Entry* subgroupEntryReusingUsername = subgroup->addEntryWithPath("Another subgroup entry");
     subgroupEntryReusingUsername->setUsername("Name2");
 
-    QList<QString> usernames = database->rootGroup()->usernamesRecursive();
+    QList<QString> usernames = database.rootGroup()->usernamesRecursive();
     QCOMPARE(usernames.size(), 2);
     QVERIFY(usernames.contains("Name1"));
     QVERIFY(usernames.contains("Name2"));
diff --git a/tests/TestOpVaultReader.cpp b/tests/TestOpVaultReader.cpp
index af332fd322..15f30f2c96 100644
--- a/tests/TestOpVaultReader.cpp
+++ b/tests/TestOpVaultReader.cpp
@@ -49,24 +49,24 @@ QPair<QString, QString>* split1PTextExportKV(QByteArray& line)
     return new QPair<QString, QString>(k, v);
 }
 
-QJsonArray* read1PasswordTextExport(QFile& f)
+QSharedPointer<QJsonArray> read1PasswordTextExport(QFile& f)
 {
-    auto result = new QJsonArray;
-    auto current = new QJsonObject;
-
     if (!f.open(QIODevice::ReadOnly)) {
         qCritical("Unable to open your text export file for reading");
-        return nullptr;
+        return {};
     }
 
+    auto result = QSharedPointer<QJsonArray>::create();
+    QJsonObject current;
+
     while (!f.atEnd()) {
         auto line = f.readLine(1024);
 
         if (line.size() == 1 and line[0] == '\n') {
-            if (!current->isEmpty()) {
-                result->append(*current);
+            if (!current.isEmpty()) {
+                result->append(current);
             }
-            current = new QJsonObject;
+            current = QJsonObject();
             continue;
         }
         const auto kv = split1PTextExportKV(line);
@@ -95,14 +95,14 @@ QJsonArray* read1PasswordTextExport(QFile& f)
                 }
             }
             auto v = lines.join("");
-            (*current)[k] = v;
+            current[k] = v;
         } else {
-            (*current)[k] = kv->second;
+            current[k] = kv->second;
         }
         delete kv;
     }
-    if (!current->isEmpty()) {
-        result->append(*current);
+    if (!current.isEmpty()) {
+        result->append(current);
     }
     f.close();
 
@@ -120,10 +120,9 @@ void TestOpVaultReader::initTestCase()
     m_password = "freddy";
 
     QFile testData(m_opVaultTextExportPath);
-    QJsonArray* data = read1PasswordTextExport(testData);
+    auto data = read1PasswordTextExport(testData);
     QVERIFY(data);
     QCOMPARE(data->size(), 27);
-    delete data;
 
     m_categoryMap.insert("001", "Login");
     m_categoryMap.insert("002", "Credit Card");
@@ -149,9 +148,9 @@ void TestOpVaultReader::testReadIntoDatabase()
 {
     QDir opVaultDir(m_opVaultPath);
 
-    auto reader = new OpVaultReader();
-    auto db = reader->readDatabase(opVaultDir, m_password);
-    QVERIFY2(!reader->hasError(), qPrintable(reader->errorString()));
+    OpVaultReader reader;
+    QScopedPointer<Database> db(reader.readDatabase(opVaultDir, m_password));
+    QVERIFY2(!reader.hasError(), qPrintable(reader.errorString()));
     QVERIFY(db);
     QVERIFY(!db->children().isEmpty());
 
@@ -179,7 +178,6 @@ void TestOpVaultReader::testReadIntoDatabase()
         QUuid u = Tools::hexToUuid(value["uuid"].toString());
         objectsByUuid[u] = value;
     }
-    delete testData;
     QCOMPARE(objectsByUuid.size(), 27);
 
     for (QUuid u : objectsByUuid.keys()) {
@@ -240,11 +238,11 @@ void TestOpVaultReader::testKeyDerivation()
 
 void TestOpVaultReader::testBandEntry1()
 {
-    auto reader = new OpVaultReader();
+    OpVaultReader reader;
     QByteArray json(R"({"hello": "world"})");
     QJsonDocument doc = QJsonDocument::fromJson(json);
     QJsonObject data;
     QByteArray entryKey;
     QByteArray entryHmacKey;
-    QVERIFY(!reader->decryptBandEntry(doc.object(), data, entryKey, entryHmacKey));
+    QVERIFY(!reader.decryptBandEntry(doc.object(), data, entryKey, entryHmacKey));
 }
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index 2a0bef4831..48b5c73515 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -79,6 +79,10 @@ static QString dbFileName = QStringLiteral(KEEPASSX_TEST_DATA_DIR).append("/NewD
 
 void TestGui::initTestCase()
 {
+    Application::setApplicationName("KeePassXC");
+    Application::setApplicationVersion(KEEPASSXC_VERSION);
+    QApplication::setQuitOnLastWindowClosed(false);
+
     QVERIFY(Crypto::init());
     Config::createTempFileInstance();
     // Disable autosave so we can test the modified file indicator
@@ -91,11 +95,12 @@ void TestGui::initTestCase()
     // Disable the update check first time alert
     config()->set("UpdateCheckMessageShown", true);
 
-    m_mainWindow.reset(new MainWindow());
-    Bootstrap::restoreMainWindowState(*m_mainWindow);
     Bootstrap::bootstrapApplication();
+
+    m_mainWindow.reset(new MainWindow());
     m_tabWidget = m_mainWindow->findChild<DatabaseTabWidget*>("tabWidget");
     m_mainWindow->show();
+    m_mainWindow->resize(1024, 768);
 }
 
 // Every test starts with opening the temp database
@@ -176,7 +181,7 @@ void TestGui::testSettingsDefaultTabOrder()
 
 void TestGui::testCreateDatabase()
 {
-    QTimer::singleShot(0, this, SLOT(createDatabaseCallback()));
+    QTimer::singleShot(50, this, SLOT(createDatabaseCallback()));
     triggerAction("actionDatabaseNew");
 
     // there is a new empty db
@@ -1435,8 +1440,9 @@ int TestGui::addCannedEntries()
 
 void TestGui::checkDatabase(QString dbFileName)
 {
-    if (dbFileName.isEmpty())
+    if (dbFileName.isEmpty()) {
         dbFileName = m_dbFilePath;
+    }
 
     auto key = QSharedPointer<CompositeKey>::create();
     key->addKey(QSharedPointer<PasswordKey>::create("a"));
diff --git a/tests/util/TemporaryFile.cpp b/tests/util/TemporaryFile.cpp
index 19622faedf..3b1e3a589c 100644
--- a/tests/util/TemporaryFile.cpp
+++ b/tests/util/TemporaryFile.cpp
@@ -71,7 +71,7 @@ bool TemporaryFile::copyFromFile(const QString& otherFileName)
     }
 
     QByteArray data;
-    while(!(data = otherFile.read(1024)).isEmpty()) {
+    while (!(data = otherFile.read(1024)).isEmpty()) {
         write(data);
     }